Changeset 60288f5 in buchla-68k for ram/idselbx.c

Timestamp:

07/09/2017 12:23:40 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

6dd74a9

Parents:

0c834c5

Message:

Make function pointers more consistent.

File:

• ram/idselbx.c (modified) (11 diffs)

ram/idselbx.c

@@ -21 +21 @@
 extern  void    tsplot4(int *obase, int nw, int fg, int row, int col, char *str, int pitch);
 extern  void    vbfill4(unsigned *obj, short obwidth, short xmin, short ymin, short xmax, short ymax, unsigned color);
-extern  void    enterit(void);
+extern  short   entbh(short n);
 extern  void    vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
 extern  void    advicur(void);
@@ -65 +65 @@
 
 short   bx_null(void);
-void    idfnbox(short n);
+short   idfnbox(short n);
 
 /* 
@@ -89 +89 @@
         {  1,  56, 509, 208,     12, idfnbox},  /* 12: Level */
 
-        {  1, 210, 110, 236, 0x0000, enterit},  /* 13: Source- Mlt */
-        {112, 210, 142, 236, 0x0000, enterit},  /* 14: Pt */
-        {144, 210, 206, 236, 0x0000, enterit},  /* 15: Time */
-        {208, 210, 366, 236, 0x0000, enterit},  /* 16: Value */
-        {368, 210, 509, 236, 0x0000, enterit},  /* 17: Action */
+        {  1, 210, 110, 236, 0x0000, entbh},    /* 13: Source- Mlt */
+        {112, 210, 142, 236, 0x0000, entbh},    /* 14: Pt */
+        {144, 210, 206, 236, 0x0000, entbh},    /* 15: Time */
+        {208, 210, 366, 236, 0x0000, entbh},    /* 16: Value */
+        {368, 210, 509, 236, 0x0000, entbh},    /* 17: Action */
 
         {  1, 238, 131, 348, 0x0000, idfnbox},  /* 18: Algorithm */
         {133, 238, 267, 251, 0x0000, idfnbox},  /* 19: Voice & Inst */
-        {269, 238, 379, 306, 0x0000, enterit},  /* 20: Oscillators */
+        {269, 238, 379, 306, 0x0000, entbh},    /* 20: Oscillators */
         {381, 238, 509, 348, 0x0000, idfnbox},  /* 21: Waveshape */
 
-        {133, 308, 379, 348, 0x0000, enterit},  /* 22: Variables */
+        {133, 308, 379, 348, 0x0000, entbh},    /* 22: Variables */
 
         {133, 252, 267, 306,     19, idfnbox},  /* 23: Name & Comments */
@@ -435 +435 @@
 */
 
-void idfnbox(short n)
+short idfnbox(short n)
 {
         register short col, i, row;
@@ -453 +453 @@
                 /* handle data entry special case for resonance in filter fn. */
 
-                if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62)) {
-                        enterit();
-                        return;
-                }
+                if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62))
+                        return(entbh(-1));
 
                 switch (pntsv) {        /* dispatch off of point select state */
@@ -486 +484 @@
                 }
 
-                return;
+                return(TRUE);
 
         } else if (hitbox EQ 18) {              /* configuration */
@@ -493 +491 @@
 
                         wcmenu(0);
-                        return;
+                        return(TRUE);
 
                 } else {
 
-                        enterit();
-                        return;
+                        return(entbh(-1));
                 }
 /* 
@@ -537 +534 @@
                         }
 
-                        return;
+                        return(SUCCESS);
 
                 } else {
 
-                        enterit();      /* do data entry */
-                        return;
+                        return(entbh(-1));      /* do data entry */
                 }
 /* 
@@ -552 +548 @@
 
                         wcmenu(1);
-                        return;
+                        return(TRUE);
 
                 } else {
 
-                        enterit();
-                        return;
+                        return(entbh(-1));
                 }
 
@@ -592 +587 @@
                 }
 
-                return;
+                return(TRUE);
 /* 
 
@@ -622 +617 @@
 
                 setgc(ICURX, ICURY);            /* put cursor in center */
-                return;
+                return(TRUE);
         }
-}
+
+        return(FALSE);
+}