Browse Source

fixed a bug on host_system_send().

tags/v1.9
tmk 12 years ago
parent
commit
7386c76191
5 changed files with 9 additions and 3 deletions
  1. 1
    1
      adb_usb/Makefile
  2. 1
    0
      adb_usb/config.h
  3. 1
    0
      hhkb/config_pjrc.h
  4. 1
    1
      host.c
  5. 5
    1
      pjrc/usb.c

+ 1
- 1
adb_usb/Makefile View File

@@ -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



+ 1
- 0
adb_usb/config.h View File

@@ -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

+ 1
- 0
hhkb/config_pjrc.h View File

@@ -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

+ 1
- 1
host.c View File

@@ -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)

+ 5
- 1
pjrc/usb.c View File

@@ -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

Loading…
Cancel
Save