diff options
Diffstat (limited to 'include/libcasio/setup.h')
-rw-r--r-- | include/libcasio/setup.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/include/libcasio/setup.h b/include/libcasio/setup.h index c27e578..957551e 100644 --- a/include/libcasio/setup.h +++ b/include/libcasio/setup.h @@ -19,7 +19,10 @@ #ifndef LIBCASIO_SETUP_H # define LIBCASIO_SETUP_H # include "cdefs.h" + CASIO_BEGIN_NAMESPACE +CASIO_STRUCT(casio_setup, casio_setup_t) +CASIO_STRUCT(casio_setup_export, casio_setup_export_t) /* The real setup from the calculator is either a group of 100/200 byte * register, or a string-byte map (e.g. "Axes" -> 0x01). @@ -94,12 +97,12 @@ CASIO_BEGIN_NAMESPACE /* Main structure. */ -typedef struct casio_setup_s { +struct casio_setup { unsigned int casio_setup_iflags; unsigned int casio_setup_wflags; unsigned int casio_setup_mflags; unsigned char casio_setup_vals[casio_setup_nvals]; -} casio_setup_t; +}; /* --- * Utilities. @@ -109,39 +112,26 @@ CASIO_BEGIN_DECLS /* Initialize the structure. */ -CASIO_EXTERN void CASIO_EXPORT casio_init_setup +CASIO_EXTERN(void) casio_init_setup OF((casio_setup_t *casio__setup)); /* Feed the structure. */ -CASIO_EXTERN int CASIO_EXPORT casio_feed_setup_seven +CASIO_EXTERN(int) casio_feed_setup_seven OF((casio_setup_t *casio__setup, char const *casio__name, int casio__val)); -CASIO_EXTERN int CASIO_EXPORT casio_feed_setup_mcs +CASIO_EXTERN(int) casio_feed_setup_mcs OF((casio_setup_t *casio__setup, int casio__id, int casio__val)); /* Export settings into a map. */ -# if 0 -typedef void casio_setup_export_t - OF((void *casio__cookie, const char *casio__name, int casio__value)); - -CASIO_EXTERN void CASIO_EXPORT casio_export_setup - OF((casio_setup_t *casio__setup, casio_setup_export_t *casio__export, - void *casio__cookie)); - --- or -- - struct casio_setup_export { char const *casio_setup_export_name; int casio_setup_export_code; int casio_setup_export_val; }; -typedef struct casio_setup_export_seven casio_setup_export_seven_t; - -CASIO_EXTERN casio_iter_t *CASIO_EXPORT casio_export_setup_seven +CASIO_EXTERN(tio_iter_t *) casio_export_setup_seven OF((casio_setup_t *casio__setup)); -# endif CASIO_END_DECLS CASIO_END_NAMESPACE |