Mercurial > louis > kiibohd-controller

comparison Output/pjrcUSB/arm/usb_rawio.c @ 449:45feb80a2ad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Major USB update, fixes most (if not all) known issues USB - General - Refactored descriptors - Enabled/Disable USB endpoints - Added debug flags for special features - Code cleanup - Interface count calculation based off of enabled endpoints - Delayed wTotalLength calculation to simplify descriptor offsets - Re-ordered endpoints and interfaces - Added more debug output - Added usbInitTime to show how long keyboard initialization took (Useful when debugging bad init sequences) - Added function for usb_resume() which takes care of the resume sequence * Resume is now only called if packets are starting to timeout USB - Special Options - Added enableDeviceRestartOnUSBTimeout * A last resort hammer for bad USB Chipsets/OSs, don't use if you can help it * Disabled - Added enableUSBResume * Enables host resume wake-up signalling, required to wake a computer from sleep * Enabled - Added enableUSBLowPowerNegotiation * Enables power negotiation hack * Required to use firmware with an IPad and other hard-limit low-power USB hosts * Hasn't been tested with the recent changes * Disabled - Added enableUSBSuspend * Enables power down events on host USB bus suspend * Enabled USB - Keyboard - Attempted to cleanup HID SET_REPORT * Works much better * Still has an issue under Linux which generates *a lot* of NAKs (initializes quickly regardless) + Not present on other keyboards + SETUP -> OUT -> IN : This sequence is the problem + Specifically during the OUT phase - Enabled USB - CDC Virtual Serial Port - Code cleanup - Added convenience struct USBCDCLineCoding for easier debugging - Attempted to cleanup CDC_SET_LING_CODING * Works much better * Still has an issue under Linux which generates *a lot* of NAKs (initializes quickly regardless) + SETUP -> OUT -> IN : This sequence is the problem + Specifically during the OUT phase + Likely the same issues as HID SET_REPORT - Enabled USB - Mouse - Enabled USB - Joystick - Disabled USB - RawIO - Initial code, API not used yet - Disabled DFU - Updated load script, now faster
author Jacob Alexander <haata@kiibohd.com>
date Tue, 31 May 2016 00:19:45 -0700
parents
children
comparison
equal deleted inserted replaced
448:077a1dfd8529 449:45feb80a2ad1
1 /* Copyright (C) 2016 by Jacob Alexander
2 *
3 * Permission is hereby granted, free of charge, to any person obtaining a copy
4 * of this software and associated documentation files (the "Software"), to deal
5 * in the Software without restriction, including without limitation the rights
6 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7 * copies of the Software, and to permit persons to whom the Software is
8 * furnished to do so, subject to the following conditions:
9 *
10 * The above copyright notice and this permission notice shall be included in
11 * all copies or substantial portions of the Software.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19 * THE SOFTWARE.
20 */
21
22 #include <kll_defs.h>
23 #if enableRawIO_define == 1
24
25 // ----- Includes -----
26
27 // Compiler Includes
28 #include <string.h> // For memcpy
29
30 // Project Includes
31 #include <Lib/OutputLib.h>
32 #include <print.h>
33
34 // Local Includes
35 #include "usb_dev.h"
36 #include "usb_rawio.h"
37
38
39
40 // ----- Defines -----
41
42 // Maximum number of transmit packets to queue so we don't starve other endpoints for memory
43 #define TX_PACKET_LIMIT 5
44
45
46
47 // ----- Functions -----
48
49 // Check for packets available from host
50 uint32_t usb_rawio_available()
51 {
52 // Error if USB isn't configured
53 if ( !usb_configuration )
54 return 0;
55
56 // Query number of bytes available from the endpoint
57 return usb_rx_byte_count( RAWIO_RX_ENDPOINT );
58 }
59
60 // Retrieve packets from host
61 // Always returns RAWIO_RX_SIZE
62 int32_t usb_rawio_rx( void *buf, uint32_t timeout )
63 {
64 usb_packet_t *rx_packet;
65 uint32_t begin = millis();
66
67 // Read
68 while ( 1 )
69 {
70 // Error if USB isn't configured
71 if ( !usb_configuration )
72 return -1;
73
74 // Retrieve packet
75 rx_packet = usb_rx( RAWIO_RX_ENDPOINT );
76 if ( rx_packet )
77 break;
78
79 // Check for timeout
80 if ( millis() - begin > timeout || !timeout )
81 {
82 warn_msg("RAWIO Rx - Timeout, dropping packet.");
83 return 0;
84 }
85
86 yield();
87 }
88
89 // Transfer packet from USB buffer to given buffer
90 memcpy( buf, rx_packet->buf, RAWIO_RX_SIZE );
91 usb_free( rx_packet );
92
93 // Data sent in full packet chunks
94 return RAWIO_RX_SIZE;
95 }
96
97 // Send packet to host
98 // XXX Only transfers RAWIO_TX_SIZE on each call (likely 64 bytes)
99 // Always returns RAWIO_TX_SIZE
100 int32_t usb_rawio_tx( const void *buf, uint32_t timeout )
101 {
102 usb_packet_t *tx_packet;
103 uint32_t begin = millis();
104
105 while ( 1 )
106 {
107 // Error if USB isn't configured
108 if ( !usb_configuration )
109 return -1;
110
111 // Make sure we haven't exceeded the outgoing packet limit
112 if ( usb_tx_packet_count( RAWIO_TX_ENDPOINT ) < TX_PACKET_LIMIT )
113 {
114 // Allocate a packet buffer
115 tx_packet = usb_malloc();
116 if ( tx_packet )
117 break;
118 }
119
120 // Check for timeout
121 if ( millis() - begin > timeout )
122 {
123 warn_msg("RAWIO Tx - Timeout, dropping packet.");
124 return 0;
125 }
126
127 yield();
128 }
129
130 // Copy input buffer to usb packet buffer and assign length
131 memcpy( tx_packet->buf, buf, RAWIO_TX_SIZE );
132 tx_packet->len = RAWIO_TX_SIZE;
133
134 // Send USB packet
135 usb_tx( RAWIO_TX_ENDPOINT, tx_packet );
136
137 return RAWIO_TX_SIZE;
138 }
139
140 #endif
141