di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Cleanup

Browse Source 
- Changing main device type to HID (0x03)
This commit is contained in:
Jacob Alexander 2014-09-23 11:42:40 -07:00
parent ed9abf88a3
commit 94608f93e9
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Output/pjrcUSB/avr/usb_keyboard_serial.c
View File

@ -171,7 +171,7 @@ inline void usb_keyboard_send()
// ----- USB Virtual Serial Port (CDC) Functions ----- // ----- USB Virtual Serial Port (CDC) Functions -----
// get the next character, or -1 if nothing received // get the next character, or -1 if nothing received
int16_t usb_serial_getchar(void) int16_t usb_serial_getchar()
{ {
uint8_t c, intr_state; uint8_t c, intr_state;
@ -205,7 +205,7 @@ int16_t usb_serial_getchar(void)
} }
// number of bytes available in the receive buffer // number of bytes available in the receive buffer
uint8_t usb_serial_available(void) uint8_t usb_serial_available()
{ {
uint8_t n=0, i, intr_state; uint8_t n=0, i, intr_state;
@ -224,7 +224,7 @@ uint8_t usb_serial_available(void)
} }
// discard any buffered input // discard any buffered input
void usb_serial_flush_input(void) void usb_serial_flush_input()
{ {
uint8_t intr_state; uint8_t intr_state;
@ -480,24 +480,24 @@ void usb_serial_flush_output(void)
// at full USB speed), but they are set by the host so we can // at full USB speed), but they are set by the host so we can
// set them properly if we're converting the USB to a real serial // set them properly if we're converting the USB to a real serial
// communication // communication
uint32_t usb_serial_get_baud(void) uint32_t usb_serial_get_baud()
{ {
uint32_t *baud = (uint32_t*)cdc_line_coding; uint32_t *baud = (uint32_t*)cdc_line_coding;
return *baud; return *baud;
} }
uint8_t usb_serial_get_stopbits(void) uint8_t usb_serial_get_stopbits()
{ {
return cdc_line_coding[4]; return cdc_line_coding[4];
} }
uint8_t usb_serial_get_paritytype(void) uint8_t usb_serial_get_paritytype()
{ {
return cdc_line_coding[5]; return cdc_line_coding[5];
} }
uint8_t usb_serial_get_numbits(void) uint8_t usb_serial_get_numbits()
{ {
return cdc_line_coding[6]; return cdc_line_coding[6];
} }
uint8_t usb_serial_get_control(void) uint8_t usb_serial_get_control()
{ {
return cdc_line_rtsdtr; return cdc_line_rtsdtr;
} }
@ -587,7 +587,7 @@ void usb_device_reload()
// WDT Setup for software reset the chip // WDT Setup for software reset the chip
void wdt_init(void) void wdt_init()
{ {
MCUSR = 0; MCUSR = 0;
wdt_disable(); wdt_disable();
@ -595,7 +595,7 @@ void wdt_init(void)
// initialize USB // initialize USB
void usb_init(void) void usb_init()
{ {
HW_CONFIG(); HW_CONFIG();
USB_FREEZE(); // enable USB USB_FREEZE(); // enable USB
@ -674,19 +674,19 @@ ISR( USB_GEN_vect )
// Misc functions to wait for ready and send/receive packets // Misc functions to wait for ready and send/receive packets
static inline void usb_wait_in_ready(void) static inline void usb_wait_in_ready()
{ {
while (!(UEINTX & (1<<TXINI))) ; while (!(UEINTX & (1<<TXINI))) ;
} }
static inline void usb_send_in(void) static inline void usb_send_in()
{ {
UEINTX = ~(1<<TXINI); UEINTX = ~(1<<TXINI);
} }
static inline void usb_wait_receive_out(void) static inline void usb_wait_receive_out()
{ {
while (!(UEINTX & (1<<RXOUTI))) ; while (!(UEINTX & (1<<RXOUTI))) ;
} }
static inline void usb_ack_out(void) static inline void usb_ack_out()
{ {
UEINTX = ~(1<<RXOUTI); UEINTX = ~(1<<RXOUTI);
} }
@ -697,7 +697,7 @@ static inline void usb_ack_out(void)
// other endpoints are manipulated by the user-callable // other endpoints are manipulated by the user-callable
// functions, and the start-of-frame interrupt. // functions, and the start-of-frame interrupt.
// //
ISR(USB_COM_vect) ISR( USB_COM_vect )
{ {
uint8_t intbits; uint8_t intbits;
const uint8_t *list; const uint8_t *list;

6
Output/pjrcUSB/avr/usb_keyboard_serial.h
View File

@ -24,6 +24,8 @@
#ifndef usb_keyboard_serial_h__ #ifndef usb_keyboard_serial_h__
#define usb_keyboard_serial_h__ #define usb_keyboard_serial_h__
// ----- Includes -----
// Compiler Includes // Compiler Includes
#include <stdint.h> #include <stdint.h>
@ -40,6 +42,7 @@
#include "output_com.h" #include "output_com.h"
// ----- Function Declarations ----- // ----- Function Declarations -----
// Basic USB Configuration // Basic USB Configuration
@ -257,7 +260,7 @@ static const uint8_t PROGMEM device_descriptor[] = {
18, // bLength 18, // bLength
1, // bDescriptorType 1, // bDescriptorType
0x00, 0x02, // bcdUSB 0x00, 0x02, // bcdUSB
0, // bDeviceClass 0x03, // bDeviceClass - 0x03 = HID Class
0, // bDeviceSubClass 0, // bDeviceSubClass
0, // bDeviceProtocol 0, // bDeviceProtocol
ENDPOINT0_SIZE, // bMaxPacketSize0 ENDPOINT0_SIZE, // bMaxPacketSize0
@ -647,5 +650,6 @@ static const struct descriptor_list_struct {
#define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct)) #define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct))
#endif // usb_keyboard_serial_h__ #endif // usb_keyboard_serial_h__