fixed a bug on host_system_send().

diff --git a/adb_usb/Makefile b/adb_usb/Makefile
index 56b342df947f26413222e56c5a0bd2805658c933..f4c5031cb6c2f291e25944d28e6f566fae84d24e 100644 (file)
--- a/adb_usb/Makefile
+++ b/adb_usb/Makefile
@@ -38,7 +38,7 @@ F_CPU = 16000000
 #
 #MOUSEKEY_ENABLE = yes # Mouse keys
 #PS2_MOUSE_ENABLE = yes        # PS/2 mouse(TrackPoint) support
-#EXTRAKEY_ENABLE = yes # Audio control and System control
+EXTRAKEY_ENABLE = yes  # Audio control and System control
 #NKRO_ENABLE = yes     # USB Nkey Rollover
 
 

diff --git a/adb_usb/config.h b/adb_usb/config.h
index 6431ede4cf38dfc9833da908660b842e13c2621a..52d5925a508e43bd9c50da1a5f10bc6e64bf0fd7 100644 (file)
--- a/adb_usb/config.h
+++ b/adb_usb/config.h
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0ADB
+#define DEVICE_VER      0x0101
 #define MANUFACTURER    t.m.k.
 #define PRODUCT         ADB keyboard converter
 #define DESCRIPTION     convert ADB keyboard to USB

diff --git a/hhkb/config_pjrc.h b/hhkb/config_pjrc.h
index 8379202ca8117e8ac2eee3adc35f6feb25deefbc..fffe3522c7937f248e9e057d9c3209b83c5ce813 100644 (file)
--- a/hhkb/config_pjrc.h
+++ b/hhkb/config_pjrc.h
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0xCAFE
+#define DEVICE_VER      0x0101
 #define MANUFACTURER    t.m.k.
 #define PRODUCT         HHKB mod
 #define DESCRIPTION     t.m.k. keyboard firmware for HHKB mod

diff --git a/host.c b/host.c
index 65b5ddcbb300ab0fdfb4c5fea71da3b2f3009dea..c5383ed4242c705c703a79fe1e9f3cc2852de923 100644 (file)
--- a/host.c
+++ b/host.c
@@ -142,7 +142,7 @@ void host_mouse_send(report_mouse_t *report)
 void host_system_send(uint16_t data)
 {
     if (!driver) return;
-    (*driver->send_consumer)(data);
+    (*driver->send_system)(data);
 }
 
 void host_consumer_send(uint16_t data)

diff --git a/pjrc/usb.c b/pjrc/usb.c
index 9989a4b2d958c5fe6f8a0f14a8b1f777a4c07e69..20afc1b8834a22fd00b6fc46c15d923bc7311794 100644 (file)
--- a/pjrc/usb.c
+++ b/pjrc/usb.c
@@ -66,6 +66,10 @@
 #   define PRODUCT_ID          0xBABE
 #endif
 
+#ifndef DEVICE_VER
+#   define DEVICE_VER          0x0100
+#endif
+
 
 // USB devices are supposed to implment a halt feature, which is
 // rarely (if ever) used.  If you comment this line out, the halt
@@ -134,7 +138,7 @@ static uint8_t PROGMEM device_descriptor[] = {
        ENDPOINT0_SIZE,                         // bMaxPacketSize0
        LSB(VENDOR_ID), MSB(VENDOR_ID),         // idVendor
        LSB(PRODUCT_ID), MSB(PRODUCT_ID),       // idProduct
-       0x00, 0x01,                             // bcdDevice
+       LSB(DEVICE_VER), MSB(DEVICE_VER),       // bcdDevice
        1,                                      // iManufacturer
        2,                                      // iProduct
        0,                                      // iSerialNumber