Changeset 60288f5 in buchla-68k for include

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.

Location:

include

Files:

• configs.h (modified) (1 diff)
• curpak.h (modified) (1 diff)
• fields.h (modified) (2 diffs)
• midas.h (modified) (1 diff)

include/configs.h

@@ -731 +731 @@
 char    *cfgptr[MAXCFG] = {
 
-        cfg_00, cfg_01, cfg_02, cfg_03, cfg_04,
-        cfg_05, cfg_06, cfg_07, cfg_08, cfg_09,
-        cfg_10, cfg_11
-};
+        (char *)cfg_00, (char *)cfg_01, (char *)cfg_02, (char *)cfg_03,
+        (char *)cfg_04, (char *)cfg_05, (char *)cfg_06, (char *)cfg_07,
+        (char *)cfg_08, (char *)cfg_09, (char *)cfg_10, (char *)cfg_11
+};

include/curpak.h

@@ -32 +32 @@
         void            (*e_key)(void);
         void            (*m_key)(void);
-        void            (*d_key)(void);
-        void            (*not_fld)(short k);
+        void            (*d_key)(short k);
+        short           (*not_fld)(short k);
         struct fet      *curfet;
         struct selbox   *csbp;

include/fields.h

@@ -14 +14 @@
         short   frcol;          /* rightmost column of field */
         short   ftags;          /* field tags / parameters (used variously) */
-        void    (*ebto)(short ftags);
+        short   (*ebto)(short n);
                                 /* edit buffer 'to' (setup) function */
-        void    (*ebfrom)(short ftags);
+        short   (*ebfrom)(short n);
                                 /* edit buffer 'from' (parse) function */
-        void    (*redisp)(short ftags);
+        short   (*redisp)(short nn);
                                 /* field (re)display function */
-        void    (*datain)(short ftags, short asig);
+        short   (*datain)(short nn, short k);
                                 /* data entry function */
 };
@@ -31 +31 @@
         short   sbymax;         /* maximum y - bottom edge of box */
         short   sbarg;          /* select box argument */
-        void    (*boxhit)(short sbarg);
+        short   (*boxhit)(short n);
                                 /* box-hit function */
 };

include/midas.h

@@ -8 +8 @@
 */
 
-typedef short   (*PFS)();       /* pointer to a function returning a short */
+typedef void    (*LPF)(short _1, short _2);     /* pointer to a LCD panel function */
 
 #define SM_SCALE(x)     (((x) * 252) & 0x7FE0)