From 9275a6fdcb16475858d3577570dfccae1f7b9c4f Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 14 May 2012 13:32:47 +0900
Subject: [PATCH] cleanup

---
 ChangeLog      | 12 +++++++++++
 src/usb-msc.c  |  2 +-
 src/usb_prop.c | 55 +++++++++++++++++---------------------------------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43dda42..896188b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-05-14  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_prop.c (MSC_INTERFACE_NO): New.
+	(gnuk_setup_endpoints_for_interface): Cleanup with MSC_INTERFACE_NO.
+	(gnuk_setup_with_data, gnuk_setup_with_nodata): Likewise.
+
+	* src/usb-msc.c: Rename from usb_msc.c.
+
+	* src/usb-msc.h: Rename from usb_msc.h.
+
+	* src/Makefile.in: Follow the rename of usb-msc.c.
+
 2012-05-12  Niibe Yutaka  <gniibe@fsij.org>
 
 	* src/usb_msc.c (ep6_out): Rename (was: ep7_out).
diff --git a/src/usb-msc.c b/src/usb-msc.c
index 6aef706..0a5ebac 100644
--- a/src/usb-msc.c
+++ b/src/usb-msc.c
@@ -1,5 +1,5 @@
 /*
- * usb_msc.c -- USB Mass Storage Class protocol handling
+ * usb-msc.c -- USB Mass Storage Class protocol handling
  *
  * Copyright (C) 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
diff --git a/src/usb_prop.c b/src/usb_prop.c
index f42ead4..bd1bf18 100644
--- a/src/usb_prop.c
+++ b/src/usb_prop.c
@@ -67,12 +67,21 @@ vcom_port_setup_with_nodata (uint8_t RequestNo)
 
   return USB_UNSUPPORT;
 }
+
+#define VCOM_NUM_INTERFACES 2
+#else
+#define VCOM_NUM_INTERFACES 0
 #endif
 
 #ifdef PINPAD_DND_SUPPORT
 #include "usb_msc.h"
+#define MSC_NUM_INTERFACES 1
+#else
+#define MSC_NUM_INTERFACES 0
 #endif
 
+#define NUM_INTERFACES (1+VCOM_NUM_INTERFACES+MSC_NUM_INTERFACES)
+#define MSC_INTERFACE_NO (1+VCOM_NUM_INTERFACES)
 
 uint32_t bDeviceState = UNCONNECTED; /* USB device status */
 
@@ -110,11 +119,7 @@ gnuk_setup_endpoints_for_interface (uint16_t interface)
     }
 #endif
 #ifdef PINPAD_DND_SUPPORT
-# ifdef ENABLE_VIRTUAL_COM_PORT
-  else if (interface == 3)
-# else
-  else if (interface == 1)
-# endif
+  else if (interface == MSC_INTERFACE_NO)
     {
       /* Initialize Endpoint 6 */
       usb_lld_setup_endpoint (ENDP6, EP_BULK, 0, ENDP6_RXADDR, ENDP6_TXADDR,
@@ -124,20 +129,6 @@ gnuk_setup_endpoints_for_interface (uint16_t interface)
 #endif
 }
 
-#ifdef PINPAD_DND_SUPPORT
-# ifdef ENABLE_VIRTUAL_COM_PORT
-# define NUM_INTERFACES 4	/* two for CDC, one for CCID, and MSC */
-# else
-# define NUM_INTERFACES 2	/* CCID and MSC */
-# endif
-#else
-# ifdef ENABLE_VIRTUAL_COM_PORT
-# define NUM_INTERFACES 3	/* two for CDC, one for CCID */
-# else
-# define NUM_INTERFACES 1	/* CCID only */
-# endif
-#endif
-
 static void
 gnuk_device_reset (void)
 {
@@ -185,21 +176,16 @@ gnuk_setup_with_data (uint8_t recipient, uint8_t RequestNo, uint16_t index)
 	  else if (RequestNo == USB_CCID_REQ_GET_DATA_RATES)
 	    usb_lld_set_data_to_send (data_rate_table, sizeof (data_rate_table));
 	}
-#if defined(PINPAD_DND_SUPPORT)
-# if defined(ENABLE_VIRTUAL_COM_PORT)
+#ifdef ENABLE_VIRTUAL_COM_PORT
       else if (index == 1)
 	vcom_port_data_setup (RequestNo);
-      else if (index == 3)
-# else
-      else if (index == 1)
-# endif
+#endif
+#ifdef PINPAD_DND_SUPPORT
+      else if (index == MSC_INTERFACE_NO)
 	{
 	  if (RequestNo == MSC_GET_MAX_LUN_COMMAND)
 	    usb_lld_set_data_to_send (lun_table, sizeof (lun_table));
 	}
-#elif defined(ENABLE_VIRTUAL_COM_PORT)
-      else if (index == 1)
-	vcom_port_data_setup (RequestNo);
 #endif
     }
 }
@@ -218,14 +204,12 @@ gnuk_setup_with_nodata (uint8_t recipient, uint8_t RequestNo, uint16_t index)
 	else
 	  return USB_UNSUPPORT;
       }
-#if defined(PINPAD_DND_SUPPORT)
-# if defined(ENABLE_VIRTUAL_COM_PORT)
+#ifdef ENABLE_VIRTUAL_COM_PORT
     else if (index == 1)
       return vcom_port_setup_with_nodata (RequestNo);
-    else if (index == 3)
-# else
-    else if (index == 1)
-# endif
+#endif
+#ifdef PINPAD_DND_SUPPORT
+    else if (index == MSC_INTERFACE_NO)
       {
 	if (RequestNo == MSC_MASS_STORAGE_RESET_COMMAND)
 	  {
@@ -235,9 +219,6 @@ gnuk_setup_with_nodata (uint8_t recipient, uint8_t RequestNo, uint16_t index)
 	else
 	  return USB_UNSUPPORT;
       }
-#elif defined(ENABLE_VIRTUAL_COM_PORT)
-    else if (index == 1)
-      return vcom_port_setup_with_nodata (RequestNo);
 #endif
     else
       return USB_UNSUPPORT;