2c2
< __FBSDID("$FreeBSD: head/sys/dev/usb2/serial/umct2.c 187176 2009-01-13 19:03:47Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/serial/umct2.c 187259 2009-01-15 02:35:40Z thompsa $");
83c83,91
< #define UMCT_ENDPT_MAX 6 /* units */
---
> enum {
> UMCT_BULK_DT_WR,
> UMCT_BULK_DT_RD,
> UMCT_BULK_CS_WR,
> UMCT_BULK_CS_RD,
> UMCT_INTR_DT_RD,
> UMCT_INTR_CS_RD,
> UMCT_N_TRANSFER = 6,
> };
90c98
< struct usb2_xfer *sc_xfer[UMCT_ENDPT_MAX];
---
> struct usb2_xfer *sc_xfer[UMCT_N_TRANSFER];
137c145
< static const struct usb2_config umct_config[UMCT_ENDPT_MAX] = {
---
> static const struct usb2_config umct_config[UMCT_N_TRANSFER] = {
139c147
< [0] = {
---
> [UMCT_BULK_DT_WR] = {
148c156
< [1] = {
---
> [UMCT_BULK_DT_RD] = {
158c166
< [2] = {
---
> [UMCT_BULK_CS_WR] = {
169c177
< [3] = {
---
> [UMCT_BULK_CS_RD] = {
180c188
< [4] = {
---
> [UMCT_INTR_DT_RD] = {
190c198
< [5] = {
---
> [UMCT_INTR_CS_RD] = {
283c291
< sc->sc_xfer, umct_config, UMCT_ENDPT_MAX, sc, &Giant);
---
> sc->sc_xfer, umct_config, UMCT_N_TRANSFER, sc, &Giant);
295c303
< maxp = UGETW(sc->sc_xfer[1]->pipe->edesc->wMaxPacketSize);
---
> maxp = UGETW(sc->sc_xfer[UMCT_BULK_DT_RD]->pipe->edesc->wMaxPacketSize);
300c308
< struct usb2_xfer *temp = sc->sc_xfer[4];
---
> struct usb2_xfer *temp = sc->sc_xfer[UMCT_INTR_DT_RD];
302,303c310,311
< sc->sc_xfer[4] = sc->sc_xfer[1];
< sc->sc_xfer[1] = temp;
---
> sc->sc_xfer[UMCT_INTR_DT_RD] = sc->sc_xfer[UMCT_BULK_DT_RD];
> sc->sc_xfer[UMCT_BULK_DT_RD] = temp;
305,306c313,314
< sc->sc_xfer[1]->callback = &umct_read_callback;
< sc->sc_xfer[4]->callback = &umct_intr_callback;
---
> sc->sc_xfer[UMCT_BULK_DT_RD]->callback = &umct_read_callback;
> sc->sc_xfer[UMCT_INTR_DT_RD]->callback = &umct_intr_callback;
308c316
< sc->sc_obufsize = sc->sc_xfer[0]->max_data_length;
---
> sc->sc_obufsize = sc->sc_xfer[UMCT_BULK_DT_WR]->max_data_length;
334c342
< usb2_transfer_unsetup(sc->sc_xfer, UMCT_ENDPT_MAX);
---
> usb2_transfer_unsetup(sc->sc_xfer, UMCT_N_TRANSFER);
376c384
< struct usb2_xfer *xfer_other = sc->sc_xfer[4];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UMCT_INTR_DT_RD];
407c415
< usb2_transfer_start(sc->sc_xfer[5]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_INTR_CS_RD]);
418c426
< usb2_transfer_start(sc->sc_xfer[5]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_INTR_CS_RD]);
556c564
< usb2_transfer_start(sc->sc_xfer[4]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_INTR_DT_RD]);
559c567
< usb2_transfer_start(sc->sc_xfer[1]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_DT_RD]);
568,569c576,577
< usb2_transfer_stop(sc->sc_xfer[5]);
< usb2_transfer_stop(sc->sc_xfer[4]);
---
> usb2_transfer_stop(sc->sc_xfer[UMCT_INTR_CS_RD]);
> usb2_transfer_stop(sc->sc_xfer[UMCT_INTR_DT_RD]);
572,573c580,581
< usb2_transfer_stop(sc->sc_xfer[3]);
< usb2_transfer_stop(sc->sc_xfer[1]);
---
> usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_CS_RD]);
> usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_RD]);
581c589
< usb2_transfer_start(sc->sc_xfer[0]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_DT_WR]);
589,590c597,598
< usb2_transfer_stop(sc->sc_xfer[2]);
< usb2_transfer_stop(sc->sc_xfer[0]);
---
> usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_CS_WR]);
> usb2_transfer_stop(sc->sc_xfer[UMCT_BULK_DT_WR]);
603c611
< usb2_transfer_start(sc->sc_xfer[2]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_CS_WR]);
617c625
< usb2_transfer_start(sc->sc_xfer[2]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_CS_WR]);
628c636
< struct usb2_xfer *xfer_other = sc->sc_xfer[0];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UMCT_BULK_DT_WR];
649c657
< usb2_transfer_start(sc->sc_xfer[3]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_CS_RD]);
659c667
< usb2_transfer_start(sc->sc_xfer[3]);
---
> usb2_transfer_start(sc->sc_xfer[UMCT_BULK_CS_RD]);
670c678
< struct usb2_xfer *xfer_other = sc->sc_xfer[1];
---
> struct usb2_xfer *xfer_other = sc->sc_xfer[UMCT_BULK_DT_RD];