Thanks for your work troubleshooting this! I'm a little confused but the first set of patches:
On Sat, May 29, 2010 at 11:24 AM, Peter Radcliffe <[email protected]> wrote: > --------------------------------------------------------------------------- > *** module/owlib/src/c/ow_ds9490.c.orig Sat May 29 16:13:57 2010 > --- module/owlib/src/c/ow_ds9490.c Sat May 29 15:55:10 2010 > *************** > *** 32,39 **** > --- 32,42 ---- > #ifdef __FreeBSD__ > // Add a few definitions we need > #undef HAVE_USB_INTERRUPT_READ // This call in libusb is unneeded > for FreeBSD (and it's broken) > + #if __FreeBSD__ < 8 > #include <sys/types.h> > #include <dev/usb/usb.h> > + #define USB_CLEAR_HALT BSD_usb_clear_halt > + #endif > struct usb_dev_handle { > FILE_DESCRIPTOR_OR_ERROR file_descriptor; > struct usb_bus *bus; > *************** > *** 43,50 **** > int altsetting; > void *impl_info; > }; > ! #define USB_CLEAR_HALT BSD_usb_clear_halt > ! #else > #define USB_CLEAR_HALT usb_clear_halt > #endif > > Gives me: #ifdef __FreeBSD__ // Add a few definitions we need #undef HAVE_USB_INTERRUPT_READ // This call in libusb is unneeded for FreeBSD (and it's broken) #if __FreeBSD__ < 8 #include <sys/types.h> #include <dev/usb/usb.h> #define USB_CLEAR_HALT BSD_usb_clear_halt #endif /* __FreeBSD__ < 8 */ struct usb_dev_handle { FILE_DESCRIPTOR_OR_ERROR file_descriptor; struct usb_bus *bus; struct usb_device *device; int config; int interface; int altsetting; void *impl_info; }; #define USB_CLEAR_HALT usb_clear_halt #endif /* __FreeBSD__ */ It looks like USB_CLEAR_HALT is changed twice without being used in between. Did I get the patch wrong?
------------------------------------------------------------------------------
_______________________________________________ Owfs-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/owfs-developers
