Fork of https://developer.mbed.org/users/bscott/code/STM32_USBDevice/
Fork of STM32_USBDevice by
USBSerial/USBSerial.cpp@75:43bf95761b38, 2017-10-27 (annotated)
- Committer:
- Geir Inge Tellnes
- Date:
- Fri Oct 27 17:22:45 2017 +0200
- Revision:
- 75:43bf95761b38
- Parent:
- 71:c201afb71300
Implemented USBCallback_busReset in USBCDC to reset terminal_connected
terminal_connected in USBSerial::EPBULK_OUT_callback() now only set if something received
Also check if callback configured before calling rx handler
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
samux | 1:80ab0d068708 | 1 | /* Copyright (c) 2010-2011 mbed.org, MIT License |
samux | 1:80ab0d068708 | 2 | * |
samux | 1:80ab0d068708 | 3 | * Permission is hereby granted, free of charge, to any person obtaining a copy of this software |
samux | 1:80ab0d068708 | 4 | * and associated documentation files (the "Software"), to deal in the Software without |
samux | 1:80ab0d068708 | 5 | * restriction, including without limitation the rights to use, copy, modify, merge, publish, |
samux | 1:80ab0d068708 | 6 | * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the |
samux | 1:80ab0d068708 | 7 | * Software is furnished to do so, subject to the following conditions: |
samux | 1:80ab0d068708 | 8 | * |
samux | 1:80ab0d068708 | 9 | * The above copyright notice and this permission notice shall be included in all copies or |
samux | 1:80ab0d068708 | 10 | * substantial portions of the Software. |
samux | 1:80ab0d068708 | 11 | * |
samux | 1:80ab0d068708 | 12 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING |
samux | 1:80ab0d068708 | 13 | * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
samux | 1:80ab0d068708 | 14 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, |
samux | 1:80ab0d068708 | 15 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
samux | 1:80ab0d068708 | 16 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
samux | 1:80ab0d068708 | 17 | */ |
samux | 1:80ab0d068708 | 18 | |
samux | 1:80ab0d068708 | 19 | #include "stdint.h" |
samux | 1:80ab0d068708 | 20 | #include "USBSerial.h" |
samux | 1:80ab0d068708 | 21 | |
samux | 1:80ab0d068708 | 22 | int USBSerial::_putc(int c) { |
samux | 6:d0945750af57 | 23 | if (!terminal_connected) |
samux | 6:d0945750af57 | 24 | return 0; |
samux | 1:80ab0d068708 | 25 | send((uint8_t *)&c, 1); |
samux | 1:80ab0d068708 | 26 | return 1; |
samux | 1:80ab0d068708 | 27 | } |
samux | 1:80ab0d068708 | 28 | |
samux | 1:80ab0d068708 | 29 | int USBSerial::_getc() { |
bogdanm | 11:eeb3cbbaa996 | 30 | uint8_t c = 0; |
samux | 1:80ab0d068708 | 31 | while (buf.isEmpty()); |
samux | 1:80ab0d068708 | 32 | buf.dequeue(&c); |
samux | 1:80ab0d068708 | 33 | return c; |
samux | 1:80ab0d068708 | 34 | } |
samux | 1:80ab0d068708 | 35 | |
samux | 1:80ab0d068708 | 36 | |
samux | 1:80ab0d068708 | 37 | bool USBSerial::writeBlock(uint8_t * buf, uint16_t size) { |
gte1 | 69:4fabf74d68fc | 38 | if(!terminal_connected) { |
gte1 | 69:4fabf74d68fc | 39 | return false; |
gte1 | 69:4fabf74d68fc | 40 | } |
samux | 1:80ab0d068708 | 41 | if(size > MAX_PACKET_SIZE_EPBULK) { |
samux | 1:80ab0d068708 | 42 | return false; |
samux | 1:80ab0d068708 | 43 | } |
samux | 1:80ab0d068708 | 44 | if(!send(buf, size)) { |
samux | 1:80ab0d068708 | 45 | return false; |
samux | 1:80ab0d068708 | 46 | } |
samux | 1:80ab0d068708 | 47 | return true; |
samux | 1:80ab0d068708 | 48 | } |
samux | 1:80ab0d068708 | 49 | |
samux | 1:80ab0d068708 | 50 | |
samux | 1:80ab0d068708 | 51 | |
mbed_official | 47:a0cd9646ecd1 | 52 | bool USBSerial::EPBULK_OUT_callback() { |
samux | 1:80ab0d068708 | 53 | uint8_t c[65]; |
samux | 1:80ab0d068708 | 54 | uint32_t size = 0; |
samux | 1:80ab0d068708 | 55 | |
samux | 1:80ab0d068708 | 56 | //we read the packet received and put it on the circular buffer |
samux | 1:80ab0d068708 | 57 | readEP(c, &size); |
bogdanm | 11:eeb3cbbaa996 | 58 | for (uint32_t i = 0; i < size; i++) { |
samux | 1:80ab0d068708 | 59 | buf.queue(c[i]); |
samux | 1:80ab0d068708 | 60 | } |
samux | 1:80ab0d068708 | 61 | |
gte1 | 71:c201afb71300 | 62 | // terminal must be connected now since we received packets |
Geir Inge Tellnes |
75:43bf95761b38 | 63 | if (size != 0) { |
Geir Inge Tellnes |
75:43bf95761b38 | 64 | terminal_connected = true; |
Geir Inge Tellnes |
75:43bf95761b38 | 65 | } |
gte1 | 71:c201afb71300 | 66 | |
samux | 1:80ab0d068708 | 67 | //call a potential handler |
Geir Inge Tellnes |
75:43bf95761b38 | 68 | if (rx) |
Geir Inge Tellnes |
75:43bf95761b38 | 69 | rx.call(); |
samux | 1:80ab0d068708 | 70 | |
samux | 1:80ab0d068708 | 71 | return true; |
samux | 1:80ab0d068708 | 72 | } |
samux | 1:80ab0d068708 | 73 | |
samux | 1:80ab0d068708 | 74 | uint8_t USBSerial::available() { |
samux | 1:80ab0d068708 | 75 | return buf.available(); |
samux | 1:80ab0d068708 | 76 | } |