4c4
< __FBSDID("$FreeBSD: head/sys/dev/usb2/serial/uplcom2.c 187176 2009-01-13 19:03:47Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/serial/uplcom2.c 187259 2009-01-15 02:35:40Z thompsa $");
124d123
< #define UPLCOM_N_TRANSFER 6
135a135,144
> enum {
> UPLCOM_BULK_DT_WR,
> UPLCOM_BULK_DT_RD,
> UPLCOM_BULK_CS_WR,
> UPLCOM_BULK_CS_RD,
> UPLCOM_INTR_DT_RD,
> UPLCOM_INTR_CS_RD,
> UPLCOM_N_TRANSFER = 6,
> };
>
189c198
< [0] = {
---
> [UPLCOM_BULK_DT_WR] = {
199c208
< [1] = {
---
> [UPLCOM_BULK_DT_RD] = {
209c218
< [2] = {
---
> [UPLCOM_BULK_CS_WR] = {
220c229
< [3] = {
---
> [UPLCOM_BULK_CS_RD] = {
231c240
< [4] = {
---
> [UPLCOM_INTR_DT_RD] = {
241c250
< [5] = {
---
> [UPLCOM_INTR_CS_RD] = {
720c729
< usb2_transfer_start(sc->sc_xfer[4]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
723c732
< usb2_transfer_start(sc->sc_xfer[1]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
732c741
< usb2_transfer_stop(sc->sc_xfer[4]);
---
> usb2_transfer_stop(sc->sc_xfer[UPLCOM_INTR_DT_RD]);
735,736c744,745
< usb2_transfer_stop(sc->sc_xfer[3]);
< usb2_transfer_stop(sc->sc_xfer[1]);
---
> usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_CS_RD]);
> usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_RD]);
744c753
< usb2_transfer_start(sc->sc_xfer[0]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
752,753c761,762
< usb2_transfer_stop(sc->sc_xfer[2]);
< usb2_transfer_stop(sc->sc_xfer[0]);
---
> usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_CS_WR]);
> usb2_transfer_stop(sc->sc_xfer[UPLCOM_BULK_DT_WR]);
800c809
< usb2_transfer_start(sc->sc_xfer[5]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_INTR_CS_RD]);
810c819
< usb2_transfer_start(sc->sc_xfer[5]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_INTR_CS_RD]);
821c830
< struct usb2_xfer *xfer_other = sc->sc_xfer[4];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UPLCOM_INTR_DT_RD];
840c849
< usb2_transfer_start(sc->sc_xfer[2]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_CS_WR]);
856c865
< usb2_transfer_start(sc->sc_xfer[2]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_CS_WR]);
867c876
< struct usb2_xfer *xfer_other = sc->sc_xfer[0];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UPLCOM_BULK_DT_WR];
887c896
< usb2_transfer_start(sc->sc_xfer[3]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_CS_RD]);
897c906
< usb2_transfer_start(sc->sc_xfer[3]);
---
> usb2_transfer_start(sc->sc_xfer[UPLCOM_BULK_CS_RD]);
908c917
< struct usb2_xfer *xfer_other = sc->sc_xfer[1];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UPLCOM_BULK_DT_RD];