diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-12 03:09:40 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-12 03:09:40 -0500 |
| commit | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (patch) | |
| tree | 0fa1cf4d66be6bccab4ddd563b4070b2559bcc0a /libmaple/usb/usb_callbacks.h | |
| parent | dba5b94ff3d1a5b9929abee53d6777128a5acc48 (diff) | |
| parent | 61b310c5124b27226f1a6ade5cd726128fed61aa (diff) | |
| download | librambutan-1fb0e0d727089e23d4b30e1efba5410dc4b4da14.tar.gz librambutan-1fb0e0d727089e23d4b30e1efba5410dc4b4da14.zip | |
Merge branch 'debug-serialusb'
Conflicts:
libmaple/usb/usb.c
notes/coding_standard.txt
Diffstat (limited to 'libmaple/usb/usb_callbacks.h')
| -rw-r--r-- | libmaple/usb/usb_callbacks.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmaple/usb/usb_callbacks.h b/libmaple/usb/usb_callbacks.h index a94de11..20d2c13 100644 --- a/libmaple/usb/usb_callbacks.h +++ b/libmaple/usb/usb_callbacks.h @@ -34,11 +34,12 @@ typedef enum { extern RESET_STATE reset_state; /* tracks DTR/RTS */ extern uint8 line_dtr_rts; -extern volatile uint8 countTx; -extern uint8 vcomBufferRx[VCOM_RX_EPSIZE]; /* no reason this has to be VCOM_RX_EPSIZE, could be bigger */ -extern volatile uint8 recvBufIn; /* the FIFO in index to the recvbuffer */ -extern volatile uint8 recvBufOut; /* the FIFO out index to the recvbuffer */ -extern volatile uint8 maxNewBytes; +extern volatile uint32 countTx; +extern uint8 vcomBufferRx[VCOM_RX_BUFLEN]; /* no reason this has to be VCOM_RX_EPSIZE, could be bigger */ +extern volatile uint32 recvBufIn; /* the FIFO in index to the recvbuffer */ +extern volatile uint32 recvBufOut; /* the FIFO out index to the recvbuffer */ +extern volatile uint32 maxNewBytes; +extern volatile uint32 newBytes; void vcomDataTxCb(void); void vcomDataRxCb(void); |