From 5b6b2b82e5d0f40305a1f006701386bf53428d1a Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 12 Nov 2013 13:02:02 +0900
Subject: [PATCH] regnual update

---
 ChangeLog         | 4 ++++
 regnual/regnual.c | 7 +++++--
 src/usb_lld.h     | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5251f19..8ef0aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-03  Niibe Yutaka  <gniibe@fsij.org>
 
+	* regnual/regnual.c (usb_cb_get_descriptor): Update to new API.
+
+	* src/usb_lld.h (usb_initial_feature): Remove.
+
 	* chopstx: Update to 0.01.
 	* src/pin-cir.c: Chatter fix to 200ms.
 	* src/main.c: Fix bDeviceState.
diff --git a/regnual/regnual.c b/regnual/regnual.c
index f5a12bb..c05181f 100644
--- a/regnual/regnual.c
+++ b/regnual/regnual.c
@@ -249,9 +249,13 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 }
 
 int
-usb_cb_get_descriptor (uint8_t desc_type, uint16_t index, uint16_t value)
+usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
+		       uint16_t index)
 {
   (void)index;
+  if (rcp != DEVICE_RECIPIENT)
+    return USB_UNSUPPORT;
+
   if (desc_type == DEVICE_DESCRIPTOR)
     {
       usb_lld_set_data_to_send (regnual_device_desc,
@@ -266,7 +270,6 @@ usb_cb_get_descriptor (uint8_t desc_type, uint16_t index, uint16_t value)
     }
   else if (desc_type == STRING_DESCRIPTOR)
     {
-      uint8_t desc_index = value & 0xff;
       const uint8_t *str;
       int size;
 
diff --git a/src/usb_lld.h b/src/usb_lld.h
index a9f0158..2c7a931 100644
--- a/src/usb_lld.h
+++ b/src/usb_lld.h
@@ -89,7 +89,6 @@ enum DEVICE_STATE
   CONFIGURED
 };
 
-extern const uint8_t usb_initial_feature;
 
 extern void usb_lld_init (uint8_t feature);