summaryrefslogtreecommitdiffstatshomepage
path: root/teensy/usb.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-08-03 16:48:53 +0100
committerDamien George <damien.p.george@gmail.com>2014-08-03 16:48:53 +0100
commitce23f67d9ec96d78db559f020acef6910f47e0f0 (patch)
tree1269816fbd09cd0b5523edee8f5935247fe8cc6d /teensy/usb.c
parent2e41646eb76348a25eb2f20bd1a46e6fbdbc82df (diff)
parente40c72210fef12db4b10e1070b9254ebc962c07e (diff)
downloadmicropython-ce23f67d9ec96d78db559f020acef6910f47e0f0.tar.gz
micropython-ce23f67d9ec96d78db559f020acef6910f47e0f0.zip
Merge pull request #784 from dhylands/fix-teensy-2014-08-02
Fix teensy to work with the latest tree.
Diffstat (limited to 'teensy/usb.c')
-rw-r--r--teensy/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/teensy/usb.c b/teensy/usb.c
index 5af5d7e444..37c479ec7c 100644
--- a/teensy/usb.c
+++ b/teensy/usb.c
@@ -25,7 +25,7 @@ int usb_vcp_rx_num(void) {
return usb_serial_available();
}
-char usb_vcp_rx_get(void)
+int usb_vcp_recv_byte(void)
{
return usb_serial_getchar();
}