FOLLOW-UP: Upgrading from FreeBSD 4.8 (PZERO in usb.c)

Vikash Badal - PCS Vikash.Badal at Comparex.co.za
Thu Jan 8 04:50:56 PST 2004


I created a custom kernel without usb and tons of other stuff,
It compiled fine and booted.

I had a look at some of the code changes and noticed that
the PZERO was replace with 0 in the files I looked at,
Trying to be braver, I edited the following files :
sys/bus/usb/ehci.c
sys/bus/usb/ohci.c
sys/bus/usb/usb.c

and replaced PZERO with 0. Is this correct ?

PS: The kernel compiles fine 
Diffs below:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -ru usb/ehci.c /usr/home/vix/work/old_code/sys/bus/usb/ehci.c
--- usb/ehci.c  Thu Jan  8 14:40:47 2004
+++ /usr/home/vix/work/old_code/sys/bus/usb/ehci.c      Thu Jan  8 14:23:42 2004
@@ -2341,7 +2341,7 @@
 #endif /* USB_USE_SOFTINTR */
        usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
-       tsleep(&sc->sc_softwake, 0, "ehciab", 0);
+       tsleep(&sc->sc_softwake, PZERO, "ehciab", 0);
 #endif /* USB_USE_SOFTINTR */
        splx(s);

diff -ru usb/ohci.c /usr/home/vix/work/old_code/sys/bus/usb/ohci.c
--- usb/ohci.c  Thu Jan  8 14:40:51 2004
+++ /usr/home/vix/work/old_code/sys/bus/usb/ohci.c      Thu Jan  8 14:23:42 2004
@@ -2266,7 +2266,7 @@
 #endif /* USB_USE_SOFTINTR */
        usb_schedsoftintr(&sc->sc_bus);
 #ifdef USB_USE_SOFTINTR
-       tsleep(&sc->sc_softwake, 0, "ohciab", 0);
+       tsleep(&sc->sc_softwake, PZERO, "ohciab", 0);
 #endif /* USB_USE_SOFTINTR */
        splx(s);

diff -ru usb/usb.c /usr/home/vix/work/old_code/sys/bus/usb/usb.c
--- usb/usb.c   Thu Jan  8 14:40:57 2004
+++ /usr/home/vix/work/old_code/sys/bus/usb/usb.c       Thu Jan  8 14:23:42 2004
@@ -821,7 +821,7 @@
        TAILQ_INSERT_TAIL(&usb_events, ueq, next);
        usb_nevents++;
        wakeup(&usb_events);
-       selwakeuppri(&usb_selevent, 0);
+       selwakeuppri(&usb_selevent, PZERO);
        if (usb_async_proc != NULL) {
                PROC_LOCK(usb_async_proc);
                psignal(usb_async_proc, SIGIO);

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following files contain reference to PZERO:
sys/dev/raid/twe/twe.c 
sys/dev/usbmisc/ugen/ugen.c 
sys/dev/usbmisc/uhid/uhid.c 
sys/dev/usbmisc/ums/ums.c 

i.e grep PZERO 
sys/dev/usbmisc/ugen/ugen.c
        selwakeuppri(&sce->rsel, PZERO);
        selwakeuppri(&sce->rsel, PZERO);
sys/dev/usbmisc/uhid/uhid.c
        selwakeuppri(&sc->sc_rsel, PZERO);
sys/dev/usbmisc/ums/ums.c
                selwakeuppri(&sc->rsel, PZERO);
                selwakeuppri(&sc->rsel, PZERO);
 






More information about the Bugs mailing list