aboutsummaryrefslogtreecommitdiff
path: root/libmaple/usb/usb.h
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-02-12 03:09:40 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2011-02-12 03:09:40 -0500
commitcae9d414ca59f6298f61029dd246df25b332148c (patch)
tree5cdd7a936b9fe7b5aa851fc5cfbb2b9d5aaecc78 /libmaple/usb/usb.h
parentfa9bf5b04394617df007a5ce5ebd057f0c3a8291 (diff)
parentde62129d0254812410bd44aa360d0e2f8bb23873 (diff)
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.h7
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);