summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'protocol')
-rw-r--r--protocol/adb.c2
-rw-r--r--protocol/bluefruit/bluefruit.c4
-rw-r--r--protocol/lufa/lufa.c41
-rw-r--r--protocol/pjrc/main.c1
-rw-r--r--protocol/pjrc/usb_keyboard.c2
-rw-r--r--protocol/ps2_interrupt.c1
-rw-r--r--protocol/ps2_io_avr.c1
-rw-r--r--protocol/ps2_usart.c1
-rw-r--r--protocol/usb_hid.mk1
9 files changed, 31 insertions, 23 deletions
diff --git a/protocol/adb.c b/protocol/adb.c
index f57afac937..bbff66df03 100644
--- a/protocol/adb.c
+++ b/protocol/adb.c
@@ -360,7 +360,7 @@ Commands
3: mice
Registers:
- 0: application(keyobard uses this to store its data.)
+ 0: application(keyboard uses this to store its data.)
1: application
2: application(keyboard uses this for LEDs and state of modifiers)
3: status and command
diff --git a/protocol/bluefruit/bluefruit.c b/protocol/bluefruit/bluefruit.c
index f991e4d04e..cf26b83dff 100644
--- a/protocol/bluefruit/bluefruit.c
+++ b/protocol/bluefruit/bluefruit.c
@@ -36,7 +36,7 @@ static void bluefruit_serial_send(uint8_t);
void bluefruit_keyboard_print_report(report_keyboard_t *report)
{
if (!debug_keyboard) return;
- dprintf("keys: "); for (int i = 0; i < REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
+ dprintf("keys: "); for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
dprintf(" mods: "); debug_hex8(report->mods);
dprintf(" reserved: "); debug_hex8(report->reserved);
dprintf("\n");
@@ -99,7 +99,7 @@ static void send_keyboard(report_keyboard_t *report)
bluefruit_trace_header();
#endif
bluefruit_serial_send(0xFD);
- for (uint8_t i = 0; i < REPORT_SIZE; i++) {
+ for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
bluefruit_serial_send(report->raw[i]);
}
#ifdef BLUEFRUIT_TRACE_SERIAL
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 6802f3b631..cdfc7bc6ad 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -148,8 +148,10 @@ static void Console_Task(void)
*/
void EVENT_USB_Device_Connect(void)
{
+ print("[C]");
/* For battery powered device */
if (!USB_IsInitialized) {
+ USB_Disable();
USB_Init();
USB_Device_EnableSOFEvents();
}
@@ -157,7 +159,9 @@ void EVENT_USB_Device_Connect(void)
void EVENT_USB_Device_Disconnect(void)
{
+ print("[D]");
/* For battery powered device */
+ USB_IsInitialized = false;
/* TODO: This doesn't work. After several plug in/outs can not be enumerated.
if (USB_IsInitialized) {
USB_Disable(); // Disable all interrupts
@@ -169,10 +173,13 @@ void EVENT_USB_Device_Disconnect(void)
void EVENT_USB_Device_Reset(void)
{
+ print("[R]");
}
void EVENT_USB_Device_Suspend()
{
+ print("[S]");
+ matrix_power_down();
#ifdef SLEEP_LED_ENABLE
sleep_led_enable();
#endif
@@ -180,6 +187,7 @@ void EVENT_USB_Device_Suspend()
void EVENT_USB_Device_WakeUp()
{
+ print("[W]");
suspend_wakeup_init();
#ifdef SLEEP_LED_ENABLE
@@ -489,37 +497,28 @@ int8_t sendchar(uint8_t c)
uint8_t ep = Endpoint_GetCurrentEndpoint();
Endpoint_SelectEndpoint(CONSOLE_IN_EPNUM);
if (!Endpoint_IsEnabled() || !Endpoint_IsConfigured()) {
- Endpoint_SelectEndpoint(ep);
- return -1;
+ goto ERROR_EXIT;
}
if (timeouted && !Endpoint_IsReadWriteAllowed()) {
- Endpoint_SelectEndpoint(ep);
- return - 1;
+ goto ERROR_EXIT;
}
timeouted = false;
uint8_t timeout = SEND_TIMEOUT;
- uint16_t prevFN = USB_Device_GetFrameNumber();
while (!Endpoint_IsReadWriteAllowed()) {
- switch (USB_DeviceState) {
- case DEVICE_STATE_Unattached:
- case DEVICE_STATE_Suspended:
- return -1;
+ if (USB_DeviceState != DEVICE_STATE_Configured) {
+ goto ERROR_EXIT;
}
if (Endpoint_IsStalled()) {
- Endpoint_SelectEndpoint(ep);
- return -1;
+ goto ERROR_EXIT;
}
- if (prevFN != USB_Device_GetFrameNumber()) {
- if (!(timeout--)) {
- timeouted = true;
- Endpoint_SelectEndpoint(ep);
- return -1;
- }
- prevFN = USB_Device_GetFrameNumber();
+ if (!(timeout--)) {
+ timeouted = true;
+ goto ERROR_EXIT;
}
+ _delay_ms(1);
}
Endpoint_Write_8(c);
@@ -530,6 +529,9 @@ int8_t sendchar(uint8_t c)
Endpoint_SelectEndpoint(ep);
return 0;
+ERROR_EXIT:
+ Endpoint_SelectEndpoint(ep);
+ return -1;
}
#else
int8_t sendchar(uint8_t c)
@@ -587,7 +589,8 @@ int main(void)
print("Keyboard start.\n");
while (1) {
while (USB_DeviceState == DEVICE_STATE_Suspended) {
- suspend_power_down(WDTO_120MS);
+ print("[s]");
+ suspend_power_down();
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
diff --git a/protocol/pjrc/main.c b/protocol/pjrc/main.c
index 1ef87f8651..e7bdcc059a 100644
--- a/protocol/pjrc/main.c
+++ b/protocol/pjrc/main.c
@@ -24,6 +24,7 @@
#include <stdbool.h>
#include <avr/io.h>
#include <avr/interrupt.h>
+#include <avr/wdt.h>
#include <util/delay.h>
#include "keyboard.h"
#include "usb.h"
diff --git a/protocol/pjrc/usb_keyboard.c b/protocol/pjrc/usb_keyboard.c
index 758a4edc6c..4b87b5d7b5 100644
--- a/protocol/pjrc/usb_keyboard.c
+++ b/protocol/pjrc/usb_keyboard.c
@@ -74,7 +74,7 @@ void usb_keyboard_print_report(report_keyboard_t *report)
{
if (!debug_keyboard) return;
print("keys: ");
- for (int i = 0; i < REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
+ for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
print(" mods: "); phex(report->mods); print("\n");
}
diff --git a/protocol/ps2_interrupt.c b/protocol/ps2_interrupt.c
index 259d254007..8114442bac 100644
--- a/protocol/ps2_interrupt.c
+++ b/protocol/ps2_interrupt.c
@@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <avr/interrupt.h>
#include <util/delay.h>
#include "ps2.h"
+#include "ps2_io.h"
#include "print.h"
diff --git a/protocol/ps2_io_avr.c b/protocol/ps2_io_avr.c
index be13d6696a..ed462345ba 100644
--- a/protocol/ps2_io_avr.c
+++ b/protocol/ps2_io_avr.c
@@ -1,4 +1,5 @@
#include <stdbool.h>
+#include <avr/io.h>
#include <util/delay.h>
/* Check port settings for clock and data line */
diff --git a/protocol/ps2_usart.c b/protocol/ps2_usart.c
index c2d9d0a208..6936ca7b88 100644
--- a/protocol/ps2_usart.c
+++ b/protocol/ps2_usart.c
@@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <avr/interrupt.h>
#include <util/delay.h>
#include "ps2.h"
+#include "ps2_io.h"
#include "print.h"
diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk
index 6914dce809..8fda76c2e5 100644
--- a/protocol/usb_hid.mk
+++ b/protocol/usb_hid.mk
@@ -8,6 +8,7 @@ USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0
USB_HOST_SHIELD_SRC = \
$(USB_HOST_SHIELD_DIR)/Usb.cpp \
$(USB_HOST_SHIELD_DIR)/hid.cpp \
+ $(USB_HOST_SHIELD_DIR)/usbhub.cpp \
$(USB_HOST_SHIELD_DIR)/parsetools.cpp \
$(USB_HOST_SHIELD_DIR)/message.cpp