diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-09-23 17:31:47 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-10-18 13:30:17 -0400 |
| commit | 24e294c9b0be5f2f24c9d7b9cddd163ac22efab2 (patch) | |
| tree | 9454b38a13c721d6d9d730b21594411b8fdc7662 /libmaple/usb/usb_callbacks.h | |
| parent | 985138fd8952edeb58606b0c35cf60aa0039c14f (diff) | |
| download | librambutan-24e294c9b0be5f2f24c9d7b9cddd163ac22efab2.tar.gz librambutan-24e294c9b0be5f2f24c9d7b9cddd163ac22efab2.zip | |
usb: Prepare for moving some files to usb_reg_map.h.
usb_config.h: Remove usb_regs.h dependency; fix includes; add license.
usb_callbacks.h: Change includes to the pieces of usb_lib/ it uses,
which doesn't include usb_regs.h.
descriptors.h: Remove unused usb_lib.h include.
usb.h: Remove unused usb_lib.h include. Some cosmetic commenting.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/usb/usb_callbacks.h')
| -rw-r--r-- | libmaple/usb/usb_callbacks.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmaple/usb/usb_callbacks.h b/libmaple/usb/usb_callbacks.h index 20d2c13..a71af01 100644 --- a/libmaple/usb/usb_callbacks.h +++ b/libmaple/usb/usb_callbacks.h @@ -4,9 +4,11 @@ #define __USB_CALLBACKS #include "libmaple.h" -#include "usb_lib.h" #include "usb_config.h" +#include "usb_type.h" +#include "usb_core.h" + #define SET_LINE_CODING 0x20 #define GET_LINE_CODING 0x21 #define SET_COMM_FEATURE 0x02 @@ -29,11 +31,11 @@ typedef enum { DTR_UNSET, DTR_HIGH, DTR_NEGEDGE, - DTR_LOW + DTR_LOW } RESET_STATE; extern RESET_STATE reset_state; /* tracks DTR/RTS */ -extern uint8 line_dtr_rts; +extern uint8 line_dtr_rts; 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 */ |