Changeset 0170798 in buchla-68k

Timestamp:

07/11/2017 05:46:49 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

4d04f41

Parents:

7af8be4

Message:

Added last missing function pointer prototypes.

Files:

• libcio/putc.c (modified) (1 diff)
• prolog/croot.c (modified) (1 diff)
• prolog/croot.x (modified) (1 diff)
• ram/swinit.c (modified) (1 diff)
• ram/vtyper.c (modified) (1 diff)
• ram/vtyper.x (modified) (2 diffs)
• rom/romp.c (modified) (1 diff)

libcio/putc.c

@@ -8 +8 @@
 #include "ram.h"
 
-static int16_t (*cls_rtn)();
+static void (*cls_rtn)(void);
 
 int16_t _ClFlag;

prolog/croot.c

@@ -21 +21 @@
 #define MAXARGS         30      /* maximum number of command line arguments */
 
-int16_t (*_clsall)();
+void (*_clsall)(void);
 
 /* 

prolog/croot.x

@@ -15 +15 @@
 */
 
-extern  int16_t         (*_clsall)();
+extern  void            (*_clsall)(void);
 
 /*

ram/swinit.c

@@ -35 +35 @@
 void    (*premove)(void);       /* cursor pre-move function */
 void    (*pstmove)(void);       /* cursor post-move function */
-void    (*vt_adv)(void);        /* vtyper data cursor advance function */
-void    (*vt_bsp)(void);        /* vtyper data cursor backspace function */
-void    (*vt_cdn)(void);        /* vtyper data cursor down function */
-void    (*vt_cup)(void);        /* vtyper data cursor up function */
-void    (*vt_dsp)(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
-                                /* vtyper display function */
-void    (*vt_stop)(void);       /* vtyper exit function */
+vtcurs  vt_adv;                 /* vtyper data cursor advance function */
+vtcurs  vt_bsp;                 /* vtyper data cursor backspace function */
+vtcurs  vt_cdn;                 /* vtyper data cursor down function */
+vtcurs  vt_cup;                 /* vtyper data cursor up function */
+vtchar  vt_dsp;                 /* vtyper display function */
+vtcurs  vt_stop;                /* vtyper exit function */
 void    (*x_key)(void);         /* X key processor */
 void    (*xy_dn)(void);         /* cursor - finger on (down) */

ram/vtyper.c

@@ -41 +41 @@
 */
 
-void vtsetup(uint16_t *obj, int16_t (*dsp)(), int16_t col, int8_t *ptr, int16_t tr, int16_t tc, int16_t (*adv)(), int16_t (*bsp)(), int16_t (*cup)(), int16_t (*cdn)(), int16_t (*stop)(), uint16_t fg, uint16_t bg)
+void vtsetup(uint16_t *obj, vtchar dsp, int16_t col, int8_t *ptr, int16_t tr, int16_t tc, vtcurs adv, vtcurs bsp, vtcurs cup, vtcurs cdn, vtcurs stop, uint16_t fg, uint16_t bg)
 {
         vtobj   = obj;          /* setup object pointer */

ram/vtyper.x

@@ -8 +8 @@
 
 #include "stdint.h"
+
+typedef void            (*vtchar)(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
+typedef void            (*vtcurs)(void);
 
 /*
@@ -28 +31 @@
 extern  void            vtcyupd(void);
 extern  void            vtdisp(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
-extern  void            vtsetup(uint16_t *obj, int16_t (*dsp)(), int16_t col, int8_t *ptr, int16_t tr, int16_t tc, int16_t (*adv)(), int16_t (*bsp)(), int16_t (*cup)(), int16_t (*cdn)(), int16_t (*stop)(), uint16_t fg, uint16_t bg);
+extern  void            vtsetup(uint16_t *obj, vtchar dsp, int16_t col, int8_t *ptr, int16_t tr, int16_t tc, vtcurs adv, vtcurs bsp, vtcurs cup, vtcurs cdn, vtcurs stop, uint16_t fg, uint16_t bg);
 extern  int16_t         vtyper(void);

rom/romp.c

@@ -119 +119 @@
 
         int8_t  *cname;         /* command name pointer */
-        int16_t (*cp)();        /* command parser function pointer */
-        int16_t (*cx)();        /* command execution function pointer */
+        int16_t (*cp)(void);    /* command parser function pointer */
+        int16_t (*cx)(void);    /* command execution function pointer */
         int8_t  *hstr;          /* help string pointer */
 };