Changes to dwc_otg USB controller code (stable/10)

[Hans Petter Selasky]

On 06/05/14 06:41, Scott, Brian wrote:
> Hi,
>
> A few little problems with the compiler...
>
> /usr/src/sys/modules/usb/dwc_otg/../../../dev/usb/controller/dwc_otg.c:3692:21: error: assigning to 'struct usb_bus_methods *' from 'const struct usb_bus_methods *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
>          sc->sc_bus.methods = &dwc_otg_bus_methods;
>                             ^ ~~~~~~~~~~~~~~~~~~~~
> /usr/src/sys/modules/usb/dwc_otg/../../../dev/usb/controller/dwc_otg.c:4727:16: error: assigning to 'struct usb_pipe_methods *' from 'const struct usb_pipe_methods *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
>                          ep->methods = &dwc_otg_device_isoc_methods;
>                                      ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /usr/src/sys/modules/usb/dwc_otg/../../../dev/usb/controller/dwc_otg.c:4729:16: error: assigning to 'struct usb_pipe_methods *' from 'const struct usb_pipe_methods *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
>                          ep->methods = &dwc_otg_device_non_isoc_methods;
>                                      ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 3 errors generated.
>
> [I guessing I did this right: the changeset just listed the one file changed so I copied the file over to my stable/10 source tree and compiled. If there are other related things I need to track down then let me know]
>
> Brian

Hi,

That won't work. You need to patch the 10-stable sources:

fetch -o dwc_otg.diff 
"http://svnweb.freebsd.org/base/head/sys/dev/usb/controller/dwc_otg.c?r1=266833&r2=267044&view=patch"
cd /usr/src/sys
cat dwc_otg.diff | patch -p2

--HPS