Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7372
Modified Files: Tag: branch-v0-39-2-extended hid.c hid.h hid_darwin.c input_arrays.h Log Message: fixed sloppy global variable declarations so that things compile properly with full compiler optimizations
Index: input_arrays.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/input_arrays.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** input_arrays.h 6 Feb 2006 21:18:53 -0000 1.1 --- input_arrays.h 20 Dec 2006 16:22:25 -0000 1.1.2.1 *************** *** 3,40 ****
! char *ev[32]; ! char *ev_syn[512]; ! char *ev_key[512]; ! char *ev_rel[16]; ! char *ev_abs[64]; ! char *ev_msc[8]; ! char *ev_led[16]; ! char *ev_snd[8]; ! char *ev_rep[2]; ! char *ev_ff[128]; ! char *ev_pwr[1]; ! char *ev_ff_status[2]; ! char *ev_5[16]; ! char *ev_6[16]; ! char *ev_7[16]; ! char *ev_8[16]; ! char *ev_9[16]; ! char *ev_10[16]; ! char *ev_11[16]; ! char *ev_12[16]; ! char *ev_13[16]; ! char *ev_14[16]; ! char *ev_15[16]; ! char *ev_16[16]; ! char *ev_19[16]; ! char *ev_24[16]; ! char *ev_25[16]; ! char *ev_26[16]; ! char *ev_27[16]; ! char *ev_28[16]; ! char *ev_29[16]; ! char *ev_30[16]; ! char *ev_31[16]; ! char **event_names[32];
--- 3,40 ----
! extern char *ev[32]; ! extern char *ev_syn[512]; ! extern char *ev_key[512]; ! extern char *ev_rel[16]; ! extern char *ev_abs[64]; ! extern char *ev_msc[8]; ! extern char *ev_led[16]; ! extern char *ev_snd[8]; ! extern char *ev_rep[2]; ! extern char *ev_ff[128]; ! extern char *ev_pwr[1]; ! extern char *ev_ff_status[2]; ! extern char *ev_5[16]; ! extern char *ev_6[16]; ! extern char *ev_7[16]; ! extern char *ev_8[16]; ! extern char *ev_9[16]; ! extern char *ev_10[16]; ! extern char *ev_11[16]; ! extern char *ev_12[16]; ! extern char *ev_13[16]; ! extern char *ev_14[16]; ! extern char *ev_15[16]; ! extern char *ev_16[16]; ! extern char *ev_19[16]; ! extern char *ev_24[16]; ! extern char *ev_25[16]; ! extern char *ev_26[16]; ! extern char *ev_27[16]; ! extern char *ev_28[16]; ! extern char *ev_29[16]; ! extern char *ev_30[16]; ! extern char *ev_31[16]; ! extern char **event_names[32];
Index: hid_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_darwin.c,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -C2 -d -r1.30 -r1.30.2.1 *** hid_darwin.c 25 Nov 2006 17:02:53 -0000 1.30 --- hid_darwin.c 20 Dec 2006 16:22:25 -0000 1.30.2.1 *************** *** 61,66 **** *======================================================================== */
- extern t_int hid_instance_count; // in hid.h - /* store device pointers so I don't have to query them all the time */ pRecDevice device_pointer[MAX_DEVICES]; --- 61,64 ----
Index: hid.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.h,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -C2 -d -r1.28 -r1.28.2.1 *** hid.h 22 Aug 2006 04:13:14 -0000 1.28 --- hid.h 20 Dec 2006 16:22:25 -0000 1.28.2.1 *************** *** 66,75 **** * functions can be called only after the final instance is detroyed. */ ! t_int hid_instance_count;
/* this is used to test for the first instance to execute */ ! double last_execute_time[MAX_DEVICES];
! extern unsigned short global_debug_level;
/* built up when the elements of an open device are enumerated */ --- 66,75 ---- * functions can be called only after the final instance is detroyed. */ ! EXTERN t_int hid_instance_count;
/* this is used to test for the first instance to execute */ ! EXTERN double last_execute_time[MAX_DEVICES];
! EXTERN unsigned short global_debug_level;
/* built up when the elements of an open device are enumerated */ *************** *** 95,104 ****
/* mostly for status querying */ ! unsigned short device_count;
/* store element structs to eliminate symbol table lookups, etc. */ ! t_hid_element *element[MAX_DEVICES][MAX_ELEMENTS]; /* number of active elements per device */ ! unsigned short element_count[MAX_DEVICES];
/*------------------------------------------------------------------------------ --- 95,104 ----
/* mostly for status querying */ ! EXTERN unsigned short device_count;
/* store element structs to eliminate symbol table lookups, etc. */ ! EXTERN t_hid_element *element[MAX_DEVICES][MAX_ELEMENTS]; /* number of active elements per device */ ! EXTERN unsigned short element_count[MAX_DEVICES];
/*------------------------------------------------------------------------------
Index: hid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.c,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** hid.c 22 Sep 2006 05:05:51 -0000 1.31 --- hid.c 20 Dec 2006 16:22:25 -0000 1.31.2.1 *************** *** 55,58 **** --- 55,73 ----
/*------------------------------------------------------------------------------ + * GLOBAL VARIABLES DECLARED extern IN hid.h + */ + t_int hid_instance_count; + unsigned short device_count; + + /* this is used to test for the first instance to execute */ + double last_execute_time[MAX_DEVICES]; + + /* store element structs to eliminate symbol table lookups, etc. */ + t_hid_element *element[MAX_DEVICES][MAX_ELEMENTS]; + /* number of active elements per device */ + unsigned short element_count[MAX_DEVICES]; + + + /*------------------------------------------------------------------------------ * SUPPORT FUNCTIONS */