externals/io/hidio hidio.h,1.6,1.7 - Pd-cvs

4 Dec 2006


      Update of /cvsroot/pure-data/externals/io/hidio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9647
Modified Files:
    hidio.h 
Log Message:
some more changes for Windows compatibility
Index: hidio.h
===================================================================
RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hidio.h	4 Dec 2006 05:23:35 -0000	1.6
--- hidio.h	4 Dec 2006 13:16:33 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  #define LOG_INFO 6
  #define LOG_WARNING 4
+ #define LOG_ERR 3
  #define vsnprintf _vsnprintf
  #else
***************
*** 88,93 ****
  #ifndef PD
    void				*x_obex;
  #endif
- 	t_int               x_fd;
    void                *x_ff_device;
    short               x_device_number;
--- 89,99 ----
  #ifndef PD
    void				*x_obex;
+ #endif
+ #ifdef _WINDOWS
+ 	HANDLE				x_fd;
+ #endif
+ #ifdef __linux__
+ 	t_int               x_fd;
  #endif
    void                *x_ff_device;
    short               x_device_number;
***************
*** 132,139 ****
  #endif /* __linux__ */
  #ifdef _WIN32
! 	/* this should store the UsagePage and Usage */
  #endif /* _WIN32 */
  #ifdef __APPLE__
!     void *pHIDElement;  // pRecElement on Mac OS X; ... on Windows
  #endif /* __APPLE__ */
      t_symbol *type; // Linux "type"; HID "usagePage", but using the hidio scheme
--- 138,147 ----
  #endif /* __linux__ */
  #ifdef _WIN32
! 	/* this stores the UsagePage and UsageID */
! 	unsigned short usage_page;
! 	unsigned short usage_id;
  #endif /* _WIN32 */
  #ifdef __APPLE__
!     void *pHIDElement;  // pRecElement on Mac OS X
  #endif /* __APPLE__ */
      t_symbol *type; // Linux "type"; HID "usagePage", but using the hidio scheme