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.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.h')
| -rw-r--r-- | libmaple/usb/usb.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmaple/usb/usb.h b/libmaple/usb/usb.h index ffba9ff..0ed02e5 100644 --- a/libmaple/usb/usb.h +++ b/libmaple/usb/usb.h @@ -73,9 +73,10 @@ void usb_lpIRQHandler(void); void usbWaitReset(void); /* blocking functions for send/receive */ -uint16 usbSendBytes(uint8* sendBuf,uint16 len); -uint8 usbBytesAvailable(void); -uint8 usbReceiveBytes(uint8* recvBuf, uint8 len); +void usbBlockingSendByte(char ch); +uint32 usbSendBytes(uint8* sendBuf,uint32 len); +uint32 usbBytesAvailable(void); +uint32 usbReceiveBytes(uint8* recvBuf, uint32 len); uint8 usbGetDTR(void); uint8 usbGetRTS(void); uint8 usbIsConnected(void); |