[BRLTTY] error compile due to new USB variables

[Raoul Mégélas]

Hi all,

A month ago, the new usb stack appeared in FreeBSD CURRENT 8.0.
This means that there are a lot of new definitions in the include files.
for instance USB_SET_TIMEOUT and some other variables only exist
in <legacy/dev/usb/usb.h>.

including this file gives a lot of conflicting types as you can see below!

 

/usb_freebsd.c
In file included from ./usb_freebsd.c:33:
/usr/include/legacy/dev/usb/usb.h:122: error: conflicting types for 'usb_device_request_t'
/usr/include/dev/usb/usb.h:112: error: previous declaration of 'usb_device_request_t' was here
/usr/include/legacy/dev/usb/usb.h:199: error: conflicting types for 'usb_descriptor_t'
/usr/include/dev/usb/usb.h:234: error: previous declaration of 'usb_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:219: error: conflicting types for 'usb_device_descriptor_t'
/usr/include/dev/usb/usb.h:257: error: previous declaration of 'usb_device_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:235: error: conflicting types for 'usb_config_descriptor_t'
/usr/include/dev/usb/usb.h:342: error: previous declaration of 'usb_config_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:248: error: conflicting types for 'usb_interface_descriptor_t'
/usr/include/dev/usb/usb.h:355: error: previous declaration of 'usb_interface_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:277: error: conflicting types for 'usb_endpoint_descriptor_t'
/usr/include/dev/usb/usb.h:488: error: previous declaration of 'usb_endpoint_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:284: error: conflicting types for 'usb_string_descriptor_t'
/usr/include/dev/usb/usb.h:506: error: previous declaration of 'usb_string_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:340: error: conflicting types for 'usb_hub_descriptor_t'
/usr/include/dev/usb/usb.h:548: error: previous declaration of 'usb_hub_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:353: error: conflicting types for 'usb_device_qualifier_t'
/usr/include/dev/usb/usb.h:587: error: previous declaration of 'usb_device_qualifier_t' was here
/usr/include/legacy/dev/usb/usb.h:362: error: conflicting types for 'usb_otg_descriptor_t'
/usr/include/dev/usb/usb.h:596: error: previous declaration of 'usb_otg_descriptor_t' was here
/usr/include/legacy/dev/usb/usb.h:376: error: conflicting types for 'usb_status_t'
/usr/include/dev/usb/usb.h:611: error: previous declaration of 'usb_status_t' was here
/usr/include/legacy/dev/usb/usb.h:383: error: conflicting types for 'usb_hub_status_t'
/usr/include/dev/usb/usb.h:619: error: previous declaration of 'usb_hub_status_t' was here
/usr/include/legacy/dev/usb/usb.h:403: error: conflicting types for 'usb_port_status_t'
/usr/include/dev/usb/usb.h:641: error: previous declaration of 'usb_port_status_t' was here

what is the best bet on this matter?

I think waiting yhour advice is better than making a lot of non suitable things!

Best regards,

Raoul
rmgls at free.fr