Update(usb lib of msc and device):Closes #I3Y7KC

@@ -13,6 +13,7 @@
 
 #include "hw_uart.h"
 #include "hw_misc.h"
+#include "hw_da_pp.h"
 
 #include "fifo.h"
 #include "app_nav.h"
@@ -42,9 +43,9 @@
 
 #include "usbdev.h"
 #include "daudio.h"
-#include "hw_pll.h"
 #include "optek_link.h"
 
+
 #ifdef USB_SPEAKER_AUTO_DETECT
 //U8 pre_usb_host_state, 
 U8 usb_host_state;
@@ -56,19 +57,68 @@ U8 usb_host_state;
 FIFO HIDOutFifo;
 U8 HIDOutFifoBuf[HIDOutFifoBufSize];
 
+#if 0//for new usb device lib
+USB_DEV_FEATURE_CONF usbdev_featureconf;
+#endif
+
+#ifdef USB_SPEAKER_VOL_ENABLE
+int usb_speaker_vol_gain = -1;
+#endif
+
+#if 1//def HIDFUNC
+//static U8 hidBuffer[3] ={0x01,0x00,0x00};	//3bytes for consumer usage: Report ID/keycode/00
+U8 hidBuffer[64];	//64bytes for FS HID, 1024 for HS. consumer usage: Report ID/keycode/00
+//static U16 keyi=0, HIDKeycodes[] ={0x0001,0x0002,0x0400};	//Vol+, Vol-. Mute
+#endif
+
 
 void app_nav_usbSpeaker_pocess (UI_MSG *process_msg);
 
 void app_cmd_usbSpeaker_volChange( void )
 {
-	//AUDIOdevice.Set_Volume(app_main_data.volume);
+	//DBG_Printf("usbSpeaker_volChange:%d\n\r", vol);
 
+	//AUDIOdevice.Set_Volume(app_main_data.volume);
 	//AUDIOdevice.Set_Bass_Treble(app_main_data.bass, app_main_data.treble);
 }
 
-void app_cmd_usbSpeaker_volSet( U8 vol )
+void app_cmd_usbSpeaker_volSet( U16 vol )
 {
 	//app_main_data.volume = vol;
+	DBG_Printf("usbSpeaker_volSet:%d\n\r", vol);
+
+#ifdef USB_SPEAKER_VOL_ENABLE
+
+#if 0
+	U32 switch_vol, value;
+
+	switch_vol = (vol*VOLUME_MAX) / PC_SPEAKER_VOL_MAX;
+	if (switch_vol)
+	{
+		#if 0
+		if (app_main_data.media == MEDIA_AUX)
+		{
+			value = (240+650-60) - (switch_vol*650)/VOLUME_MAX;
+		}
+		else
+		#endif
+		{
+			//240:0db position
+			value = (240+650) - (switch_vol*650)/VOLUME_MAX;
+		}
+	}
+	else
+	{
+		value = 240+990;
+	}
+	usb_speaker_vol_gain = optek_vol_table_usb_speaker[temp];
+
+	//DBG_Printf("speaker_vol_gain:0x%x, switch_vol:%d\n\r", usb_speaker_vol_gain, switch_vol);
+#else
+	usb_speaker_vol_gain = (0x8000000/10240)*vol;
+#endif
+
+#endif //USB_SPEAKER_VOL_ENABLE
 }
 
 int daudio_isMute( void );
@@ -137,7 +187,11 @@ static void usbSpeakerStreamConfig( void )
 	fifo_init(&HIDOutFifo, HIDOutFifoBuf, HIDOutFifoBufSize, TRUE);
 
 	usbdev_featureconf.HIDFuncEnable = TRUE;
+	#ifdef HIDKEY
+	usbdev_featureconf.HIDKEYEnable = TRUE;
+	#else
 	usbdev_featureconf.HIDKEYEnable = FALSE;
+	#endif
 #else
 	usbdev_featureconf.HIDFuncEnable = FALSE;
 	usbdev_featureconf.HIDKEYEnable = FALSE;
@@ -516,8 +570,9 @@ void app_nav_rmt_convert_pc_speaker(void)
 
 		//app_nav_spk_level_init ();
 
-		//app_pre_state_saving();
+		#ifdef EEPROM
 		app_save_system_data();
+		#endif
 
 		p = (U8 *) STRING_USB_SPEAKER_APP;
 		CPU_SoftReset_Flag_Setting((U8 *) p, FALSE);
@@ -542,7 +597,7 @@ void app_nav_rmt_convert_pc_speaker(void)
 		#endif
 
 
-		#if 0//def USB_SPEAKER_AUTO_DETECT
+		#ifdef USB_SPEAKER_AUTO_DETECT
 		if (!PC_USB_DETECT == USB_DEVICE_CONNECT)
 		#endif
 		{
@@ -678,8 +733,8 @@ U32 app_cmd_usbIsoOut_PUT_DATA(U8 *buffer, U32 translen)
 		//if (dlen >= EX_AUDIO_STREAM_THRESHOLD_FOR_USB_DEV)
 		{
 			//daudio_SetFBSamplerateCorrection(0);
-			DBG_Printf("start usb dev dec\n\r");
-			uDecSend(DECODE_FRAME,TRUE);
+			DBG_iPrintf("usbDev dec start\n\r");
+			uDecSend(DECODE_FRAME, TRUE);
 			app_main_data.playing_stream_status = STREAM_MEDIA;
 		}
 	}
@@ -763,5 +818,129 @@ U32 app_cmd_usbHidOut_PUT_DATA(U8 *buffer, U32 translen)
 		return (size == translen );
 }
 
+
+#ifdef HIDFUNC
+
+extern const APP_NAV_KEY APP_NAV_PC_SPEAKER_KEY [];
+
+int g_submitIntInKup( void )	//HID Input, called by UI
+{
+	DBG_Printf("%s\n\r", __func__);
+	int ret = 0, len = 3;//pipe->maxpkt;	//3 bytes for consumer INPUT
+
+	if (usbdev_featureconf.HIDKEYEnable)
+	{
+		hidBuffer[0] = 0x01;	////Report ID
+		hidBuffer[1] = 0; //consumer key up
+		hidBuffer[2] = 0; //consumer key up
+
+		ret = HIDkeyIN_Buf(hidBuffer, len);
+		DBG_USBDev_Printf("dstk_transfer ret:0x%x\n\r", ret);
+	}
+
+	return ret;
+}
+
+void _dhid_submitIntIn_finished_callback(void);
+
+int g_submitIntInKdown( void )	//HID Input, called by UI
+{
+	U16 keyval = key_process_envs.processing_key_id;
+	int ret, len;
+	
+	DBG_Printf("%s: 0x%x\n\r", __func__, keyval);
+
+	if (usbdev_featureconf.HIDKEYEnable)
+	{
+		len = 3;//pipe->maxpkt;	//8 bytes for keyboard INPUT
+		hidBuffer[0] = 0x01;	////Report ID? bSize=1 byte
+
+		if (keyval== APP_KEY_PLUS)
+		{
+			hidBuffer[1] = enHUTCONSUMER_VOLUP;//(U8)HIDKeycodes[0]; //key down, Vol+
+		}
+		else if (keyval== APP_KEY_MINUS)
+		{
+			hidBuffer[1] = enHUTCONSUMER_VOLDOWN;//(U8)HIDKeycodes[1]; //key down, Vol-
+		}
+
+		else if (keyval == APP_KEY_PLAY)
+		{
+			#if 1
+			hidBuffer[1] = enHUTCONSUMER_PLAY;//(U8)HIDKeycodes[1]; //key down, PLAY
+			#else
+			hidBuffer[1] = enHUTTELEPHONY_HOOK;//(U8)HIDKeycodes[1]; //key down, Hook
+			#endif
+		}
+		else if (keyval == APP_KEY_STOP)
+		{
+			#if 1		
+			hidBuffer[1] = enHUTCONSUMER_STOP;//(U8)HIDKeycodes[1]; //key down, STOP
+			#else
+			hidBuffer[1] = enHUTTELEPHONY_DROP;//(U8)HIDKeycodes[1]; //key down, Drop
+			#endif
+		}
+	
+		else if (keyval == APP_KEY_SKIPF)
+		{
+			#if 1
+			hidBuffer[1] = enHUTCONSUMER_NEXT;//(U8)HIDKeycodes[1]; //key down, Next
+			#else
+			hidBuffer[1] = enHUTCONSUMER_FF;//(U8)HIDKeycodes[1]; //key down, FF
+			#endif
+		}
+		else if (keyval == APP_KEY_SKIPB)
+		{
+			#if 1
+			hidBuffer[1] = enHUTCONSUMER_NEXT;//(U8)HIDKeycodes[1]; //key down, Prev		
+			#else
+			hidBuffer[1] = enHUTCONSUMER_RW;//(U8)HIDKeycodes[1]; //key down, RW
+			#endif
+		}
+
+		else if (keyval == APP_KEY_EQ)
+		{
+			hidBuffer[1] = 0x04;//(U8)HIDKeycodes[1]; //key down, Mute
+		}
+
+		hidBuffer[2] = 0x00;
+		ret = HIDkeyIN_Buf(hidBuffer, len);
+	}
+	else
+	{
+		memset(hidBuffer, 0, sizeof(hidBuffer));
+		hidBuffer[1] = (keyval & 0xff00)>>8;
+		hidBuffer[2] = (keyval & 0x00ff);
+
+		ret = HIDdataIN_Buf(hidBuffer, 4);
+	}
+
+	DBG_USBDev_Printf("dstk_transfer ret:%x\n\r", ret);
+
+	return ret;
+}
+#endif
+
+
+int isrc_audioZeroCheck( U32 *data, int size ) __INTERNAL_RAM_TEXT;
+int isrc_audioZeroCheck( U32 *data, int size )
+{
+	U32 tmp;
+	U32 i;
+	
+	tmp = 1;
+	
+	for( i=0; i<size; i++ )
+	{
+		if( data[i] != 0 )
+		{
+			tmp = 0;
+			break;
+		}
+	}
+	
+	return tmp;
+}
+
 #endif //(defined USB_SPEAKER && defined USB_DEV_ENABLE)
 

@@ -13,6 +13,8 @@
 
 #include "mem_reloc.h"
 
+#include "hw_pll.h"
+
 #include "fifo.h"
 
 #include "otg.h"
@@ -25,7 +27,7 @@
 #include "dcd.h"
 #include "daudio.h"
 #include "denumAudio.h"
-#include "optek_link.h"
+
 
 //#define DISABLE_VOLUME_CTL
 
@@ -38,6 +40,7 @@ typedef struct {
 
 DENUM_DATA denumData __USB_DEV_BSS;
 
+
 #ifdef ADC20
 //JJ+ for CXD disbale
 #define CXDDISABLE
@@ -100,7 +103,7 @@ DENUM_DATA denumData __USB_DEV_BSS;
             0x02,
             0x00
     	};
-#endif						
+#endif
 
 #if 0
 // Test for multi list of sample freqs
@@ -219,85 +222,175 @@ U8 HID_Ready=0;
 #ifdef HIDFUNC
 //USB报告描述符的定义
 static const U8 HIDReportDescriptor[]=
+
 #ifndef HIDKEY
 {	
+	//USAGE_PAGE(Generic Desktop Controls)
 	//Specific protocol for Youchang HID data In/Out!
-0x05,0x01, //HUT 3, 0x01, USAGE_PAGE (Generic Desktop)
+0x05,0x01, //HUT3, 0x01, USAGE_PAGE (Generic Desktop)
 0x09,0x00, //HUT4, Usage Undefined
 
-0xA1,0x01, 
+0xA1,0x01, //COLLECTION(Application)
+
+	//USAGE(ID)：USAGE(Rerserved)
 	0x09,0x03,	//HUT4 Usage reserved
 	0x15,0x00, 		//L Min 1 byte
 	0x26,0x00,0xFF, //L Max 2 bytes
 	
-	0x75,0x08,		//Report size 1 byte :8bits
-	0x95,0x40,		//Report Count 1 byte: 1. trans max len, 64x8bits
-	0x81,0x02,  	//Input-Constant 1 byte : Variable
+	//REPORT_SIZE(0x08): 8 bits
+	0x75,0x08,		//Report size : 8bits
+	//REPORT_COUNT(0x04):0x04 times
+//	0x95,0x04,		//Report Count 4 times: trans max len, 4xREPORT_SIZE(8) bits
+	//REPORT_COUNT(0x40):0x040 times
+	0x95,0x40,		//Report Count 64 times: trans max len, 64xREPORT_SIZE(8) bits
+	//INPUT(Data, Var, Abs)
+	0x81,0x02,  	//Input Data 1 byte : Variable
 	
-
+	//USAGE(ID)：USAGE(Joystick)
 	0x09,0x04,	//HUT4 Usage Joystick
 	0x15,0x00,		//L Min 1 byte
 	0x26,0x00,0xFF, //L Max 2 bytes
 	
+	//REPORT_SIZE(0x08):8 bits
 	0x75,0x08, 		//Report size :8bits
-	0x95,0x40, 		//Report Count: 1 byte, 64x8bits
+	//REPORT_COUNT(0x04):0x04 times
+//	0x95,0x04, 		//Report Count: 4 times, 4xREPORT_SIZE(8) bits
+	//REPORT_COUNT(0x40):0x040 times
+	0x95,0x40, 		//Report Count: 64 times, 64xREPORT_SIZE(8) bits
+	//OUTPUT(Data, Var, Abs)
 	0x91,0x02,		//Output Data 1 byte : Variable
+
+	//END COLLECTION
 0xC0
 };
+
 #else
-	//for HID Consumer device
+
+#if 0
+{
+	// Report ID 2: Advanced buttons
+	0x05, 0x0B,                 // Usage Page (Telephony Devices)
+	0x09, 0x01,                 // Usage (Phone)
+	0xA1, 0x01,                 // Collection (Application)
+		0x85, 0x01,             // Report Id (1)
+    	0x15, 0x00,             // Logical minimum (0)
+    	0x25, 0x01,             // Logical maximum (1)
+    	0x75, 0x01,             // Report Size (1)
+    	0x95, 0x01,             // Report Count (1)
+
+		0x09, 0x20,   			// Usage (HookSwitch)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+//		0x09, 0x23,             // Usage (Hold)
+		0x09, 0x26, 			// HUT14, USAGE (Drop)		bit 9 = 0x02
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+		0x09, 0x2F,             // Usage (PhoneMute)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+
+
+		0x09, 0x06,             // Usage (Telephony Key Pad)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)   
+
+		0x09, 0x50,             // Usage (SpeedDial)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+		0x09, 0x52,             // Usage (RecallNumber)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+		0x09, 0x51,             // Usage (StoreNumber)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+		0x09, 0x53,             // Usage (PhoneDirectory)
+		0x81, 0x02,             // Input (Data,Value,Relative,Bit Field)
+
+	//END COLLECTION
+	0xC0                        // End Collection  
+};
+
+#else
+
+//HID Report Descriptor in USB_Audio Device Class for Basic Audio Devices_V1.0.pdf
+//Table 8-4: Recommended Report Descriptor for Report (ID1)
+
+//for HID Telephony Device (0x0B)
 {
-    0x05, 0x0C, //HUT3, USAGE Pages (Consumer) ++++++++++++++++++++++++++++++++
+	//Table 1: Usage Pages Summary in HUT
+	//USAGE_PAGE(Consumer Devices)
+	0x05, 0x0C, //HUT3, USAGE Pages (Consumer) ++++++++++++++++++++++++++++++++
+	//Table 17: Consumer Usage Page in HUT
+	//USAGE(ID): USAGE(0x01): USAGE(Comsumer Control)
     0x09, 0x01, //USAGE HUT15 (Comsumer Control)
-    0xA1, 0x01, //COLLECTION
-	    0x85, 0x01, //Report ID
-	    0x15, 0x00, //Logical Minimum, 1 byte
-	    0x25, 0x01, //Logical Maximum, 1 byte
-	    
-	    0x75, 0x01, //HID 6.2.2.7 Global Items, Report Size, 1 bit		!Global items!
-	    0x95, 0x01, //6.2.2.7 Global Items, Report Count, 1x1bit		!Global items! 1x1 bit ?????? Not 8+3 = 0x0b ?
+    0xA1, 0x01, //COLLECTION(Application)
+		0x85, 0x01, //Report ID(0x01)
+		0x15, 0x00, //Logical Minimum(0), 1 byte
+		0x25, 0x01, //Logical Maximum(1), 1 byte
 	    
-	    0x09, 0xE9, //HUT15 USAGE (Vol Inc)	bit 0 = 0x01	 	++++++++++++++++++++++++++++++++Byte 1
-	    0x81, 0x02, //	Input (Array0 Var1) Variable   ...... belows are same, 1x1 bit !
+		//REPORT_SIZE(0x01):1 bit
+		0x75, 0x01, //HID 6.2.2.7 Global Items, Report Size, 1 bit	!Global items!
+		//REPORT_COUNT(0x01):1 times
+		0x95, 0x01, //6.2.2.7 Global Items, Report Count, 1x1bit	!Global items! 1x1 bit ?????? Not 8+3 = 0x0b ?
+
+		//USAGE(ID): USAGE(0xE9): USAGE(Volume Up)
+		0x09, 0xE9, //HUT15 USAGE (Vol Inc)	bit 0 = 0x01	++++++++++++++++++++++++++++++++Byte 1
+		0x81, 0x02, //	Input (Data, Var, Abs)				...... belows are same, 1x1 bit !
+
+		//USAGE(ID): USAGE(0xEA): USAGE(Volume Down)
+		0x09, 0xEA, //HUT15 USAGE (Vol Dec)	bit 1 = 0x02
+		0x81, 0x02,	//	Input(Data, Var, Abs), Var:Variable, Abs: Absolute
 
-	    0x09, 0xEA, //HUT15 USAGE (Vol Dec)	bit 1 = 0x02
-	    0x81, 0x02,	//	Input
+		0x09, 0xCD, //USAGE (Play/Pause)bit 2 = 0x04
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xCD, //USAGE (Play/Pause)bit 2
-	    0x81, 0x02, //	Input
+		0x09, 0xB5, //USAGE (Scan Next)	bit 3 = 0x08
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xB5, //USAGE (Scan Next)	bit 3
-	    0x81, 0x02, //	Input
+	 	0x09, 0xB6, //USAGE (Scan Prev)	bit 4 = 0x10
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xB6, //USAGE (Scan Prev)	bit 4
-	    0x81, 0x02, //	Input
+		0x09, 0xB7, //USAGE (Stop)		bit 5 = 0x20
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xB7, //USAGE (Stop)		bit 5 = 0x20
-	    0x81, 0x02, //	Input
+		0x09, 0xB5, //USAGE (FF)		bit 6 = 0x40
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xB3, //USAGE (FF)		bit 6
-	    0x81, 0x02, //	Input
+		0x09, 0xB6, //USAGE (Rewind)	bit 7 = 0x80
+	 	0x81, 0x02, //	Input(Data, Var, Abs)
+
+		//USAGE_PAGE(Telephony Devices)
+		0x05, 0x0B, //HUT3, Usage Page (Telephony Device) ++++++++++++++++++++++++++++++++Byte 2
+		#if 0
+		0x09, 0x24, //HUT14, USAGE (Redial)		bit 9
+		0x81, 0x02, //	Input
+		#endif
+		
+		//USAGE(ID): USAGE(0x20): USAGE(Hook Switch)
+		0x09, 0x20, //HUT14, USAGE (Hook)		bit 8 = 0x01
+		0x81, 0x02, //	Input(Data, Var, Abs)
 
-	    0x09, 0xB4, //USAGE (Rewind)	bit 7
-	    0x81, 0x02, //	Input
-	        
-	    0x05, 0x0B, //HUT3, Usage Page (Telephony Device) ++++++++++++++++++++++++++++++++Byte 2
-	    0x09, 0x24, //HUT14, USAGE (Redial)		bit 8
-	    0x81, 0x02, //	Input
+//		0x09, 0x24, //HUT14, USAGE (Redial)		bit 9 = 0x02
+		0x09, 0x26, //HUT14, USAGE (Drop)		bit 9 = 0x02
+		0x81, 0x02, //	Input(Data, Var, Abs)
 	    
-	    0x09, 0x20, //HUT14, USAGE (Hook)		bit 9
-	    0x81, 0x02, //	Input
+		//USAGE(ID): USAGE(0x2F): USAGE(Phone Mute)
+		0x09, 0x2F, //HUT14, USAGE (Phone Mute) bit a = 0x04
 
-	    0x09, 0x2F, //HUT14, USAGE (Phone Mute) bit a = 0x0400
-	    0x81, 0x06, //	Input (Array0 Var1 Abs0 Rela1)
-	        
-	    0x95, 0x05, //Report Count				5x?	//padding 5x1 bit
-	    0x81, 0x01, //	Input (Array0 Var1) Constant
+ 		//Input (Data, Var, Rel): (Bit0 {Data(0)|Constant(1)}; Bit1 {Array(0)|Variable(1)}; Bit2 {Absolute(0)|Relative(1)}
+ 		0x81, 0x06, //Input (Data, Var, Rel)
+		
+		//REPORT_COUNT(5)
+		0x95, 0x05, //Report Count 5 times, Pad Report to 5x1 bits
+		0x81, 0x01, //	Input(Const, Array, Abs))
 
-    0xC0
+	//END COLLECTION
+	0xC0
 };
+#endif
+
 #endif //HIDKEY
-/*	//for HID keyboard
+/*
+//for HID keyboard
 {
  //每行开始的第一字节为该条目的前缀，前缀的格式为：
  //D7~D4：bTag。D3~D2：bType；D1~D0：bSize。以下分别对每个条目注释。
@@ -528,12 +621,13 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 		#define	AUDIO_FEATURE_UNIT_LEN		0x00
 #else
 
-	#ifdef	VOLUME_MASTER_CHAN_ONLY
+	#ifdef VOLUME_MASTER_CHAN_ONLY
 		#ifdef ADC20
-		#define	AUDIO_FEATURE_UNIT_LEN		0x12
+		#define AUDIO_FEATURE_UNIT_LEN		0x12
 		#else
-		#define	AUDIO_FEATURE_UNIT_LEN		0x0A
-		//#define	AUDIO_FEATURE_UNIT_LEN		0x09
+		#define AUDIO_FEATURE_UNIT_LEN		0x0A
+		//#define AUDIO_FEATURE_UNIT_LEN		0x0D
+		//#define AUDIO_FEATURE_UNIT_LEN		0x09
 		#endif
 	#else
 		#define	AUDIO_FEATURE_UNIT_LEN		0x0d
@@ -597,16 +691,27 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 //	AUDIO_CTL_INTF_TOTAL_LEN:
 //	AUDIO_AC_INT_ENDP_LEN:		FB ep for ADC20
 
+#ifdef HIDFUNC
+	#ifdef HIDKEY
+	#define HID_LEN (0x19)
+	#else
+	#define HID_LEN (0x19 + 0x7)
+	#endif
+#else
+	#define HID_LEN (0x00)
+#endif
+
+
 #ifdef ONLYSpeakerCFG//JJ 0x6D
 
  #ifdef HIDFUNC
 	#ifdef USBDEV_ISOIN_ASYNC
 	//#ifndef HIDKEY
 	 	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x7)
+			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_AC_INT_ENDP_LEN + HID_LEN)
 	#else
 		#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x7)
+			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + HID_LEN)
 	#endif
  #else
 	#ifdef DFUFUNC
@@ -624,10 +729,11 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
  #endif //HIDFUNC
 
 #else //ONLYSpeakerCFG
+
 //9+48+52+52 = 109+52 = 161, 162, 9+79+52+52 = 192 (0xc0) for now, 0x19 Desc of HID  [Here only ADC20]
  #ifdef HIDFUNC
  
-  #ifndef ONLYMicCFG
+	#ifndef ONLYMicCFG
 	#ifndef SECOND_OUTEP
 /*	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
 			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x7)
@@ -636,26 +742,22 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x19)
 */
 	#ifdef USBDEV_ISOIN_ASYNC
-	#ifndef HIDKEY
-	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x7)
-	#else
 	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19)
-	#endif //HIDKEY
+			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_CLASS_STD_ENDP_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + HID_LEN)
 	#else 	//USBDEV_ISOIN_ASYNC
 	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + 0x19 + 0x7)
+			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + AUDIO_AC_INT_ENDP_LEN + HID_LEN)
 	#endif 	//USBDEV_ISOIN_ASYNC
 	
 	#endif //SECOND_OUTEP
-  #else
+	#else
  	//No Asnyc, but with HID !
 	#define	DEV_CONFIGURATION_TOTAL_LEN		(USB_CONFIGURATION_DESCRIPTOR_LENGTH + USB_IAD_LENGTH + \
-			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + 0x19 + 0x7)
-  #endif //ONLYMicCFG
+			AUDIO_CTL_INTF_TOTAL_LEN + AUDIO_STREAM_INTF_TOTAL_LEN + HID_LEN)
+	#endif //ONLYMicCFG
 
  #else //no HIDFUNC
+ 
 		#ifdef USBDEV_ISOIN_ASYNC
 		
 		  #ifndef ONLYMicCFG
@@ -690,6 +792,7 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 		#endif //USBDEV_ISOIN_ASYNC
 
  #endif //HIDFUNC 
+ 
 #endif //ONLYSpeakerCFG
 
 
@@ -720,14 +823,29 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 #define	AUDIO_STRAM_NON_ZEROBAND_ALT_SET	1
 #define	AUDIO_STRAM_NON_ZEROBAND_ALT_SET2	2
 
+
 //For DNUSB -- FU -- SPK
-#define	AUDIO_INPUT_TERM_ID			0x01
-#define	AUDIO_FEATURE_UNIT_ID		0x02
-#define	AUDIO_OUTPUT_TERM_ID		0x03
+//Input Terminal ID1 represents the AudioSreaming Interface 
+//that is used to stream the speaker data from the Host to Headset device
+#define	AUDIO_INPUT_TERM_ID         0x01
+//The Output Pin of Input Terminal ID1 is connecte to the Input Pin 1 of Mixer Unit ID8
+#define	AUDIO_INPUT_MIXER_TERM_ID   0x08
+//The Output Pin of Mixer Unit ID8 is connected to the Input Pin of Feature Unit ID2
+#define	AUDIO_FEATURE_UNIT_ID       0x02
+//The Output Pin of Feature Unit ID2 is connected to the Input Pin of the Out Terminal ID3
+//which presents the physical speaker(s)
+#define AUDIO_OUTPUT_TERM_ID        0x03
+
+
 //For MIC -- FU -- UPUSB
+//Input Terminal ID4 represents the phsical miccrophone
 #define	AUDIO_INPUTMIC_TERM_ID		0x04
-//#define	AUDIO_FEATUREMIC_UNIT_ID	0x05
-#define	AUDIO_OUTPUTMIC_TERM_ID		0x06
+//The Output Pin of Input Terminal ID4 is connecte to the Input Pin of Featture ID5
+//#define AUDIO_FEATUREMIC_UNIT_ID	0x05
+//The Output Pin of Feature Unit ID5 is connected to the Input Pin of the Out Terminal ID6,
+//which represents the AudioStreaming Interface that is used to stream the microphone data to the Host
+#define	AUDIO_OUTPUTMIC_TERM_ID		0x06 //to host USB in
+
 
 #ifdef ADC20
 #define	AUDIO_CLASS_SPEC_VER		0x0200
@@ -752,10 +870,39 @@ U8 QdeviceDescriptor[USB_DEVICE_DESCRIPTOR_LENGTH]  = {  //USB20 9.6.1
 //39, 40 for now
 
 
-#define	AUDIO_CHANNEL_CONFIG	0x03	//L + R
+/*
+//below copied from USB Device Class Definition for Audio Devices 1.0 
+D0: Left Front (L)
+D1: Right Front (R)
+D2: Center Front (C)
+D3: Low Frequency Enhancement (LFE)
+D4: Left Surround (LS)
+D5: Right Surround (RS)
+D6: Left of Center (LC)
+D7: Right of Center (RC)
+D8: Surround (S)
+D9: Side Left (SL)
+D10: Side Right (SR)
+D11: Top (T)
+D15..12: Reserved
+*/
+#if (AUDIO_OUT_CHANNELS == 2)
+#define AUDIO_CHANNEL_CONFIG        0x0003	//L + R
+#define AUDIO_OUT_CHANNEL_CONFIG    0x0003	//L + R
+#elif (AUDIO_OUT_CHANNELS == 6)
+#define	AUDIO_CHANNEL_CONFIG        0x003F	//L R C (LFE) Ls Rs 
+#define AUDIO_OUT_CHANNEL_CONFIG    0x003F	//L R C (LFE) Ls Rs
+#else
+#define	AUDIO_CHANNEL_CONFIG        0x0003	//L + R
+#define AUDIO_OUT_CHANNEL_CONFIG    0x0003	//L + R
+#endif
 
 
+#if 0
 #define	FEATURE_UNIT_CTL_SIZE	2
+#else
+#define	FEATURE_UNIT_CTL_SIZE	1
+#endif
 
 #ifdef	VOLUME_MASTER_CHAN_ONLY
 #define	FU_BMA_CTL0				0x03	//mute & vol
@@ -871,28 +1018,36 @@ static const U8 fsUsbSpeaker_configDescriptor[] =	{
 	DESCRIPTOR_TYPE_CONFIGURATION,
 	BYTE_SPLIT1(DEV_CONFIGURATION_TOTAL_LEN),//0x09 remove FU of Mic, 0x19 Desc of HID
 	BYTE_SPLIT2(DEV_CONFIGURATION_TOTAL_LEN),
-#ifdef HIDFUNC			//(? HID ) + (? Speaker ) + (? Mic ) + (? DFU)
- #ifndef ONLYSpeakerCFG//JJ
-   #ifndef ONLYMicCFG
-	4,//INTERFACE_NUM,  //now have 4 INTFs:INTF0, INTF1 for OUT, INTF2 for IN, INTF3/ITF4 for HID IN/OUT
-   #else //ONLYMicCFG
-	3,//INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF2 for IN, INTF3 for HID IN
-   #endif
- #else //ONLYSpeakerCFG
-	3,//INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF1 for OUT, INTF3 for HID IN
- #endif
-#else //no HIDFUNC		//(? Speaker ) + (? Mic ) + (? DFU)
- #ifndef ONLYSpeakerCFG//JJ
-   #ifndef ONLYMicCFG
-	3,//INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF1 for OUT, INTF2 for IN
-   #else //ONLYMicCFG
-	2,//INTERFACE_NUM,  //now have 2 INTFs:INTF0, INTF2 for IN
-   #endif
- #else //ONLYSpeakerCFG
-	2,//INTERFACE_NUM,  //now have 2 INTFs:INTF0, INTF1 for OUT
- #endif
+#ifdef HIDFUNC //(? HID ) + (? Speaker ) + (? Mic ) + (? DFU)
+
+	#ifndef ONLYSpeakerCFG//JJ
+		#ifndef ONLYMicCFG
+			4, //INTERFACE_NUM,  //now have 4 INTFs:INTF0, INTF1 for OUT, INTF2 for IN, INTF3/ITF4 for HID IN/OUT
+		#else
+			3, //INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF2 for IN, INTF3 for HID IN
+		#endif
+
+	#else //ONLYSpeakerCFG
+		3, //INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF1 for OUT, INTF3 for HID IN
+	#endif
+
+#else //no HIDFUNC	//(? Speaker ) + (? Mic ) + (? DFU)
+
+	#ifndef ONLYSpeakerCFG//JJ
+		#ifndef ONLYMicCFG
+			3, //INTERFACE_NUM,  //now have 3 INTFs:INTF0, INTF1 for OUT, INTF2 for IN
+		#else
+			2, //INTERFACE_NUM,  //now have 2 INTFs:INTF0, INTF2 for IN
+	#endif
+
+	#else //ONLYSpeakerCFG
+		2, //INTERFACE_NUM,  //now have 2 INTFs:INTF0, INTF1 for OUT
+	#endif
+
 #endif //HIDFUNC
+
 	//3,//INTERFACE_NUM,  //now have 2 INTFs:INTF0, INTF1 for OUT, DFU
+
 CONFIG_VALUE,       //argument to the SetConfiguration() request to select this configuration
 0x00,               //Index of string descriptor describing this configuration
 CONFIGURATION_ATTRIBUTE,
@@ -999,11 +1154,12 @@ CONFIGURATION_MAXPOWER,
 
 #ifndef ONLYMicCFG
 //----- for down pipe Terms (PC -- SPEAKER)			IT1 -- FU2 -- OT3
-	//input terminal    audio10 Table 4-3: Input Terminal Descriptor
+	//Refer to USB Device Class Definition for Audio Devices 1.0.pdf
+	//input terminal: audio 1.0: Table 4-3: Input Terminal Descriptor
 	AUDIO_INPUT_TERMINAL_LEN,       //l=0x0c, 0x11 for ADC20
 	AUDIO_DESCRIPTOR_CS_INTERFACE,
 	AUDIO_DESCRIPTOR_CS_SUB_AC_INPUT_TERMINAL, //30
-	AUDIO_INPUT_TERM_ID,            //ID = 0x01
+	AUDIO_INPUT_TERM_ID,            //ID = 0x01, 0x01 represents from Feature Unit ID1
 	BYTE_SPLIT1(AUDIO_USB_TERM_USB_STREAM),
 	BYTE_SPLIT2(AUDIO_USB_TERM_USB_STREAM),
 	0x00, //jj- AUDIO_OUTPUT_TERM_ID,   //output terminal ID = 0x03 assoc
@@ -1022,9 +1178,9 @@ CONFIGURATION_MAXPOWER,
 	BYTE_SPLIT1(0x0000),	//bmControls
 	BYTE_SPLIT2(0x0000),	//bmControls
 #else
-	AUDIO_CHANNELS,
-	BYTE_SPLIT1(AUDIO_CHANNEL_CONFIG),
-	BYTE_SPLIT2(AUDIO_CHANNEL_CONFIG),
+	AUDIO_OUT_CHANNELS, //bNrChannels
+	BYTE_SPLIT1(AUDIO_OUT_CHANNEL_CONFIG),
+	BYTE_SPLIT2(AUDIO_OUT_CHANNEL_CONFIG),
 	0x00,                   //Index of a string descriptor, first logic channel
 #endif
 	0x00,                   //Index of a string descriptor, IT
@@ -1049,10 +1205,20 @@ CONFIGURATION_MAXPOWER,
 	BYTE_SPLIT3(0x00000000),
 	BYTE_SPLIT4(0x00000000),
 #else
-	1,/*FEATURE_UNIT_CTL_SIZE,*/
-	3,//bmaControls[0]
+	#if 1
+	1,//FEATURE_UNIT_CTL_SIZE, Size in bytes of an element of the bmaControls() array: n
+	0x03,//0x02,//bmaControls[0]
 	0,//bmaControls[1]
 	0,//bmaControls[2]
+	#else
+	2,/*FEATURE_UNIT_CTL_SIZE,*/
+	0x03,//3,//bmaControls[0]
+	0x00,
+	0x00,//0,//bmaControls[1]
+	0x00,
+	0x00,//0,//bmaControls[2]
+	0x00,
+	#endif
 /*	BYTE_SPLIT1(FU_BMA_CTL0),
 	BYTE_SPLIT2(FU_BMA_CTL0),*/
 #ifndef	VOLUME_MASTER_CHAN_ONLY
@@ -1064,15 +1230,24 @@ CONFIGURATION_MAXPOWER,
 #endif //ADC20
 	0x00,   //Index of a string descriptor, describing this Feature Unit
 
-	//output terminal   audio10 Table 4-4: Output Terminal Descriptor
+
+	//Host USB Output Terminal Descriptor
+	//output terminal audio10 Table 4-4: Output Terminal Descriptor
 	AUDIO_OUTPUT_TERMINAL_LEN,  //l=9, 0x0c for ADC20
 	AUDIO_DESCRIPTOR_CS_INTERFACE,
 	AUDIO_DESCRIPTOR_CS_SUB_AC_OUTPUT_TERMINAL,
 	AUDIO_OUTPUT_TERM_ID,           //ID = 0x03
+#if 0
 	BYTE_SPLIT1(AUDIO_OUTPUT_TERM_SPEAKER),//BYTE_SPLIT1(AUDIO_OUTPUT_TERM_DESKTOP_SPEAKER),
 	BYTE_SPLIT2(AUDIO_OUTPUT_TERM_SPEAKER),//BYTE_SPLIT2(AUDIO_OUTPUT_TERM_DESKTOP_SPEAKER),
-	0x00, //jj- AUDIO_INPUT_TERM_ID,    //input terminal ID = 0x01 assoc
-	AUDIO_FEATURE_UNIT_ID, //60 bSourceID this Term is connected
+#else
+	/*BYTE_SPLIT1(AUDIO_OUTPUT_TERM_SPEAKER),*/
+	BYTE_SPLIT1(AUDIO_OUTPUT_TERM_DESKTOP_SPEAKER),
+	/*BYTE_SPLIT2(AUDIO_OUTPUT_TERM_SPEAKER),*/
+	BYTE_SPLIT2(AUDIO_OUTPUT_TERM_DESKTOP_SPEAKER),
+#endif
+	0x00, //bAssocTermal, no association
+	AUDIO_FEATURE_UNIT_ID,  //bSourceID, 0x02 represents from Feature Unit ID2
 #ifdef ADC20
 	#ifdef CXDDISABLE
 	AUDIO_CLKS_ID,			//bCSourceID, ID of the Clock Entity to which this Output Terminal is connected.
@@ -1085,13 +1260,15 @@ CONFIGURATION_MAXPOWER,
 	0x00,                   //Index of a string descriptor
 #endif	//ONLYMicCFG
 
+
 #ifndef ONLYSpeakerCFG//JJ
 //----- for up pipe Terms (MIC -- HOST)			IT4 --     -- OT6
+	//Host USB Microphone Input Terminal Descriptor
 	//input terminal  --> MIC  audio10 Table 4-3: Input Terminal Descriptor
 	AUDIO_INPUT_TERMINAL_LEN,       //l=0x0c, 0x11 for ADC20
 	AUDIO_DESCRIPTOR_CS_INTERFACE,
 	AUDIO_DESCRIPTOR_CS_SUB_AC_INPUT_TERMINAL, //30
-	AUDIO_INPUTMIC_TERM_ID,            //ID = 4
+	AUDIO_INPUTMIC_TERM_ID,         //ID = 4
 	BYTE_SPLIT1(AUDIO_INPUT_TERM_MICROPHONE),    //Terminal is Microphone.     //JJ for mic
 	BYTE_SPLIT2(AUDIO_INPUT_TERM_MICROPHONE),
 	0x00, //jj- AUDIO_OUTPUTMIC_TERM_ID,   //output terminal ID = 6 assoc
@@ -1113,7 +1290,7 @@ CONFIGURATION_MAXPOWER,
 	AUDIO_CHANNELS,
 	BYTE_SPLIT1(AUDIO_CHANNEL_CONFIG),
 	BYTE_SPLIT2(AUDIO_CHANNEL_CONFIG),
-	0x00,                   //Index of a string descriptor, first logic channel
+	0x00,                   //biChannelName, Unused. Shall be set to 0.
 #endif //ADC20
 	0x00,                   //Index of a string descriptor, IT
 	
@@ -1220,7 +1397,7 @@ CONFIGURATION_MAXPOWER,
     	AUDIO_AS_GENERAL_INTF_LEN, //80, l=7
     	AUDIO_DESCRIPTOR_CS_INTERFACE,
     	AUDIO_DESCRIPTOR_CS_SUB_AS_GENERAL,
-    	AUDIO_INPUT_TERM_ID,//AUDIO_OUTPUT_TERM_ID,         //  Spk -- TERM ID=0x01!!!
+    	AUDIO_INPUT_TERM_ID,//AUDIO_OUTPUT_TERM_ID,         //  Spk -- TERM ID=0x01!!! Terminal the endpoint connected.
     	0x01,	//? frame delay
     	BYTE_SPLIT1(AUDIO_FORMAT_TYPE_I_PCM),
     	BYTE_SPLIT2(AUDIO_FORMAT_TYPE_I_PCM),
@@ -1458,12 +1635,14 @@ CONFIGURATION_MAXPOWER,
     	AUDIO_DESCRIPTOR_CS_INTERFACE,
     	AUDIO_DESCRIPTOR_CS_SUB_AS_GENERAL,
     	AUDIO_OUTPUTMIC_TERM_ID,               // mic -- TERM ID=0x06!!! Linked to USB Stream
+//???  	AUDIO_INPUTMIC_TERM_ID,	//AUDIO_OUTPUTMIC_TERM_ID,               // mic -- TERM ID=0x06!!! Linked to USB Stream
     	0x01,	//? frame delay
     	BYTE_SPLIT1(AUDIO_FORMAT_TYPE_I_PCM),
     	BYTE_SPLIT2(AUDIO_FORMAT_TYPE_I_PCM),
 #endif
 
-    	//type I format C.3.4.2.1.3 Type I Format Type Descriptor
+
+		//type I format C.3.4.2.1.3 Type I Format Type Descriptor
 #ifdef ADC20
     	AUDIO_TYPE_I_FORMAT_LEN,            //l=11 = 8+(ns*3), 6 for ADC20
     	AUDIO_DESCRIPTOR_CS_INTERFACE,  //140
@@ -1533,6 +1712,7 @@ CONFIGURATION_MAXPOWER,
 	//? OUT or Set_Report() with Control Ep ?
 	//IF 03 HID Intf Descriptor, Alt 0, 1 Ep <0x83>, 3 HID Class code, 0 No subclass Alt0 ------
 						//0x01 Boot Intf subc, 0x01 Keyboard protocol*/
+	//HID Standard Interfance Descriptor
 #ifndef HIDKEY
 	//Keyboard { 0x09 0x04 0x03 0x00 0x02 0x03 0x01 0x01 0x00 }  2 Eps! Class code (HID code=3)! bInterfaceSubClass=1 Boot Interface subclass, bInterfaceProtocol=1 Keyboard
 	USB_INTERFACE_DESCRIPTOR_LENGTH,    //l=9
@@ -1543,16 +1723,19 @@ CONFIGURATION_MAXPOWER,
 	DESCRIPTOR_TYPE_INTERFACE, 0x03,0x00,0x01,0x03,0x00,0x00,0x00,	//HID headset
 #endif
 
+	//HID Descriptor
 	//DESCRIPTOR_TYPE_HID 0x21, HID Descriptor 1.11, 00 country, 01 Number of HID class descriptors,
 
 	//HID Desc, 0111 Specification release number, 0x00country,01#of HID class descriptors, 22 Report descriptor type, 0017/45 Total length of Report descriptor
-	0x09,0x21,0x11,0x01,0x00,0x01,0x22,sizeof(HIDReportDescriptor),0x00,//0x0045, len of report desc
-	
-	//Ep Descriptor IN Ep <0x82> <0x81> addr, 03 Interrupt 0010 Maximum packet size 01/0A Interval
-	0x07,0x05,0x82,0x03,0x40,0x00,0x0A,
+	0x09,AUDIO_DESCRIPTOR_CS_DEVICE,0x11,0x01,0x00,0x01,0x22,sizeof(HIDReportDescriptor),0x00,//0x0043, len of report desc
+
+	//HID interrupt Endpoint Descriptor
+	//Ep Descriptor IN Ep <0x82> addr, 0x03 Interrupt, Maximum packet size 0x0003/0A Interval
+//	0x07,0x05,0x82,0x03,0x40,0x00,0x0A,
+	0x07,0x05,0x82,0x03,0x03,0x00,0x0A,
 
 #ifndef HIDKEY
-	//EP <0x85> addr, 02 Interrupt 0010 Maximum packet size 01 Interval
+	//Ep Descriptor Out Ep <0x02> addr, 0x03 Interrupt, Maximum packet size 0x0040/01 Interval
 	0x07,0x05,0x02,0x03,0x40,0x00,0x01,
 #endif
 
@@ -1782,7 +1965,7 @@ static int reqGetDescriptor(void)
 
 	int ret;
 	
-	//DBG_USBDev_Printf("     reqGetD %x,%x,%x", dtype, idx, len);
+	DBG_USBDev_Printf("     reqGetD %x,%x,%x", dtype, idx, len);
 
 	switch( dtype )
 	{
@@ -1832,7 +2015,7 @@ static int reqGetDescriptor(void)
 				len = StringDescriptor[idx][0];
 			}
 			ret = dstk_transfer( pipe, TRUE, (U8*)StringDescriptor[idx], &len, NULL, TRUE );
-			//DBG_USBDev_Printf("dstk_tr %d %x %x\n", idx, len, ret);
+			DBG_USBDev_Printf("dstk_tr %d %x %x\n", idx, len, ret);
 		}
 		break;
 
@@ -1840,7 +2023,7 @@ static int reqGetDescriptor(void)
 		#ifdef	OTG_FORCE_FULL_SPEED
 		ret = reqUnknown();
 		#else
-		//DBG_USBDev_Printf("   _DEVICE_QUALIFIER\n\r");
+		DBG_USBDev_Printf("   _DEVICE_QUALIFIER\n\r");
 		if( len > sizeof(QdeviceDescriptor) )
 		{
 			len = sizeof(QdeviceDescriptor);
@@ -1853,13 +2036,13 @@ static int reqGetDescriptor(void)
 		#ifdef	OTG_FORCE_FULL_SPEED
 		ret = reqUnknown();
 		#else
-		//DBG_USBDev_Printf("   _OTHER_SPEED_CONFIG\n\r");
+		DBG_USBDev_Printf("   _OTHER_SPEED_CONFIG\n\r");
 		#endif
 		break;
 
 	#ifdef HIDFUNC
 	case DESCRIPTOR_TYPE_REPORT://JJ+ HID Report Desc
-		//DBG_USBDev_Printf("   _REPORT %x\n\r", len);
+		DBG_USBDev_Printf("   _REPORT %x\n\r", len);
 		if( len > sizeof(HIDReportDescriptor) )
 		{
 			len = sizeof(HIDReportDescriptor);
@@ -1948,8 +2131,17 @@ static int reqSetConfiguration(void)
 	{
 		ret = reqUnknown();
 	}
-void clock_sync_init(void);
+
+	#ifdef CLOCK_SYNC_WITH_MASTER_ENABLE
 	clock_sync_init();
+	#if 1
+	//clock_sync_cnt = 10000/DMA_TX_INT_INTERVAL_MS_TIME; //zjl
+	//clock_sync_cnt = (10000*1000)/DMA_TX_INT_INTERVAL_MS_TIME; //zjl
+	#else
+	//clock_sync_cnt = 25000/DMA_TX_INT_INTERVAL_MS_TIME;
+	//clock_sync_cnt = (25000*1000)/DMA_TX_INT_INTERVAL_MS_TIME;
+	#endif
+	#endif
 
 	return ret;
 }
@@ -2246,7 +2438,7 @@ static int audioReq_getFUvol(void)
 	VOLUME_SETTING *pvol;
 
 	daudio_getVol( &pvol );
-	//DBG_USBDev_Printf(" %s:%x %x %x\n", __func__, req->bRequest, pvol->cur, pvol->res);
+	DBG_Printf(" %s:%x %x %x\n", __func__, req->bRequest, pvol->cur, pvol->res);
 
 	switch(req->bRequest )
 	{
@@ -2458,7 +2650,7 @@ static int HIDreq_GetReport(void)	//send a HID report (length of packet) on EPx
 	DPIPE *pipe = dstk_getCtlPipe();
 	//dcd_ctlStatusStageAck();
 
-	DBG_USBDev_Printf("%s:0x%x\n\r", __func__, len);
+	DBG_Printf("%s:0x%x\n\r", __func__, len);
 	getReport_test[0] = (U8)req->wValue;
 	len = req->wLength;
 	ret = dstk_transfer( pipe, TRUE, (U8*)getReport_test, &len, NULL, TRUE );//Input
@@ -2476,7 +2668,7 @@ static int HIDreq_SetReport(void)	//send a HID report (length of packet) on EPx
 	DPIPE *pipe = dstk_getCtlPipe();
 	dcd_ctlStatusStageAck();
 
-	DBG_USBDev_Printf("%s:0x%x\n\r", __func__, len);
+	DBG_Printf("%s:0x%x\n\r", __func__, len);
 	
 	//len = req->wLength;
 	//ret = dstk_transfer( pipe, TRUE, (U8*)HIDReportDescriptor, &len, NULL, TRUE );//Input
@@ -2952,10 +3144,10 @@ int denum_process( IRP *irp)
 
 void _dhid_submitIntIn_finished_callback(void)
 {
-//	DBG_Printf("   %s called!\n\r", __func__);
+	DBG_Printf("%s\n\r", __func__);
 }
 
-
+#if 0
 int _dhid_submitIntIn(U8* pU8data)
 {
 	DPIPE *pipe = dstk_getIntInPipe();	//or Control pipe ?
@@ -2967,5 +3159,6 @@ int _dhid_submitIntIn(U8* pU8data)
 	DBG_USBDev_Printf("%s ret:%x\n\r", __func__, ret);
 	return ret;
 }
+#endif
 
 #endif //#ifdef USB_DEV_ENABLE

@@ -46,6 +46,7 @@ typedef enum {
 //#define	MAX_DEV_PIPES		3
 //for HID
 #define	MAX_DEV_PIPES		4
+
 //0 is dummy, ep1 Host OUT 	(in INTERFACE 01)
 #define	ENDP_NUM_ISO_OUT	1		
 //JJ+, ep2 Host IN			(in INTERFACE 02)
@@ -67,12 +68,15 @@ typedef enum {
 #define	DISO_MAX_PKT_SIZE	256
 #endif
 */
-#if 0	//for low BW cfg: such as Windows7 ...
-#define	DISO_MAX_PKT_SIZE	576
+#if 0 //for low BW cfg: such as Windows7 ...
+#define DISO_MAX_PKT_SIZE    576
 #else
-//jj #define	DISO_MAX_PKT_SIZE	(96000*2*3/1000)
-//#define	DISO_MAX_PKT_SIZE	(48000*2*3/1000)
-#define	DISO_MAX_PKT_SIZE	(48000*2*2/1000)
+//96kHz, 24-bit
+//#define DISO_MAX_PKT_SIZE  (96000*2*3/1000)
+//48kHz, 24-bit
+#define DISO_MAX_PKT_SIZE    (48000*2*3/1000)
+//48kHz, 16-bit
+//#define DISO_MAX_PKT_SIZE  (48000*2*2/1000)
 #endif
 
 typedef struct _DUSB_DEVICE {

@@ -29,6 +29,7 @@
 #include "Audio_dec.h"
 #include "optek_link.h"
 
+
 U32 usbTransLen = 0;
 U8 usbErr = 0;
 
@@ -54,10 +55,12 @@ int usb_devStart(enum_USB_DEVICE_STACK_ATTR attr)
 
 	if (usbdev_start_flag == FALSE)
 	{
-		DBG_USBDev_Printf ("usbSlave open\n\r");
+		DBG_Printf ("usbSlave open\n\r");
+		delayms(5);
 
-		//tx_mutex_get( &mutex_usb, TX_WAIT_FOREVER );
 		USB_MUTEX_LOCK;
+		DBG_Printf ("usbSlave open 1\n\r");
+		delayms(5);
 		FILL_NORMAL_IRP( &irp, enIRPT_DEV_STACK, enIRP_TYPE_DEV_START,	0,
 			attr,	0,	0,	enIRPR_SUBMIT, usbirpCompleteCallback );    //(PIRP)->param = attr !!!
 
@@ -66,14 +69,13 @@ int usb_devStart(enum_USB_DEVICE_STACK_ATTR attr)
 		DBG_assert( usbErr == enIRPR_SUCCESS );
 		usbdev_start_flag = TRUE;
 
-		//tx_mutex_put( &mutex_usb );
 		USB_MUTEX_UNLOCK;
-		//DBG_USBDev_Printf ("usb_devStart::enIRP_TYPE_DEV_START is sent!\n\r");
+		DBG_Printf ("usbSlave open exit\n\r");
 		return ( usbErr == enIRPR_SUCCESS );
 	}
 	else
 	{
-		DBG_USBDev_Printf ("usbSlave is open\n\r");
+		DBG_Printf ("usbSlave opened\n\r");
 	}
 }
 
@@ -83,25 +85,29 @@ int usb_devStop(void)
 
 	if (usbdev_start_flag == TRUE)
 	{
-		DBG_USBDev_Printf ("usbSlave close\n\r");
+		DBG_Printf ("usbSlave close\n\r");
+		delayms(5);
 
-		//tx_mutex_get( &mutex_usb, TX_WAIT_FOREVER );
 		USB_MUTEX_LOCK;
+		DBG_Printf ("usbSlave close 1\n\r");
+		delayms(5);
 		FILL_NORMAL_IRP( &irp, enIRPT_DEV_STACK, enIRP_TYPE_DEV_STOP,	0,
 			0,	0,	0,	enIRPR_SUBMIT, usbirpCompleteCallback );
 
+		DBG_Printf ("usbSlave close 2\n\r");
+		delayms(5);
 		usbmsg_sendIRP( &irp );
 		usbmsg_waitIRPcomplete();
 		DBG_assert( usbErr == enIRPR_SUCCESS );
 		usbdev_start_flag = FALSE;
 
-		//tx_mutex_put( &mutex_usb );
 		USB_MUTEX_UNLOCK;
+		DBG_Printf ("usbSlave close exit\n\r");
 		return ( usbErr == enIRPR_SUCCESS );
 	}
 	else
 	{
-		DBG_USBDev_Printf ("usbSlave is close\n\r");
+		DBG_USBDev_Printf ("usbSlave closed\n\r");
 	}
 }
 
@@ -156,6 +162,7 @@ const U8 usbAudioStringProductDescriptor[STR_PRODUCT_LENGTH] = {
 		'r',0
 };
 #endif
+
 const U8 usbAudioStringProductDescriptor[STR_PRODUCT_LENGTH] = {
 	STR_PRODUCT_LENGTH-8,
 	DESCRIPTOR_TYPE_STRING,
@@ -343,7 +350,13 @@ For 48000 Sample Frequency:
 			app_timer_usbdev_upstream_timeout_time_set(1000);			
 			change_to_game_mode_cnt = 0;
 			if (optek_link_mode == BC_SF48K_PT5MS)
-				app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,51);
+			{
+				#ifdef UPSTREAM_SAMPLERATE_48k
+				app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,60);
+				#else
+				app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,50);
+				#endif
+			}
 			else// if (optek_link_mode == BC_SF48K_PT7P5MS)
 				app_change_mode_req(GAME_HEADPHONE_PT7P5MS_T7R3E,150,75);
 		}

@@ -3,14 +3,16 @@
 
 
 //#define USB_SPEAKER_DONGLE
-#ifndef USB_SPEAKER_DONGLE
-//#define USB_SPEAKER_AUTO_DETECT
+#if 0//ndef USB_SPEAKER_DONGLE
+#define USB_SPEAKER_AUTO_DETECT
+#else
+#undef USB_SPEAKER_AUTO_DETECT
 #endif
 
 
 #if 1
 #define	VENDOR_ID    0x0475
-#define	PRODUCT_ID   0x1630
+#define	PRODUCT_ID   0x1503
 #else
 #define	VENDOR_ID    0x0000
 #define	PRODUCT_ID   0x0005
@@ -24,34 +26,40 @@
 //JJ+ for USB audio class 2.0
 //#define ADC20
 
+//JJ!!!+ for USB duplex both downwards and upwards pipe
+//Normal undef below macros, i.e. both Speaker and Mic exist!
+//#undef ONLYSpeakerCFG
+//#undef ONLYMicCFG
+
+
 
-#define HIDFUNC
+//#define HIDFUNC
 
 #ifdef HIDFUNC
 	//for HID Consumer device! 
-	//#define HIDKEY
+	#define HIDKEY
 #endif
 
-//2nd ISO In endp3In (#define	ENDP_NUM_ISO_INFB	3) for USB Audio Device Async !
+//2nd ISO IN Intf1/endp3In (#define	ENDP_NUM_ISO_INFB 3) for USB Audio Device Async !
 //#define USBDEV_ISOIN_ASYNC
 
-//JJ!!!+ for USB duplex both downwards and upwards pipe
-//only for intf, ep config
-//obsolete #define USB_DEVICE_IN_OUT_CFG
-
-
-//Test only function of USB Speaker
-//#undef ONLYSpeakerCFG
+//Only function of USB Speaker
 //#define ONLYSpeakerCFG
 
-//Test only function of USB Microphone
+//Only function of USB Microphone
 //#define ONLYMicCFG
 
 //JJ+ for DFU
 //#define DFUFUNC
 
+
 //Enable USB SOF Interrupt
+#define USB_DEV_LIB_V1P0P10
+#ifdef USB_DEV_LIB_V1P0P10
+//V1.0.10
 #define SOFINTEN
+#endif
+
 
 //Window XP/7 can support only up to 44.1, 48Khz and 16bits !!!
 //#define USB_AUDIO_SRC_44100
@@ -66,12 +74,13 @@
 /* second USB Audio Out should be mandatory ! */
 #if 1//ndef ADC20
 
-#define	AUDIO_CHANNELS          2
+#define	AUDIO_CHANNELS          2    /*for Audio Out*/
+#define	AUDIO_OUT_CHANNELS      AUDIO_CHANNELS
 #define	AUDIO_SUB_FRAME_SIZE    2    //pcm16
 #define	AUDIO_BIT_RESOLUTION    16		
 
-#if 1
-#define AUDIOIN_CHANNELS        1    /*for Audio In*/
+#if 0
+#define AUDIOIN_CHANNELS        2    /*for Audio In*/
 #else
 #define AUDIOIN_CHANNELS        1    /*for Audio In*/
 #endif
@@ -155,13 +164,15 @@
 #endif
 
 
-#if 1//for new usb device lib
+
 typedef struct {
 	BOOL	USBOutEnable;		//USB Speaker
 	BOOL	USBInEnable;		//USB Mic, ONLYMicCFG, USB_DEVICE_IN_OUT_CFG
 	BOOL	USBOutMixInEnable;	//Mix USB Out with other data then USB In.
 
+#if 1//def USB_DEV_LIB_V1P0P10
 	BOOL	SOFINTEnable;		//Enable SOF Interrupt
+#endif
 
 	BOOL	ADC20Enable;		//ADC20
 	
@@ -191,7 +202,6 @@ typedef struct {
 } USB_DEV_FEATURE_CONF;
 
 extern USB_DEV_FEATURE_CONF usbdev_featureconf;
-#endif
 
 /*
 	device
@@ -204,8 +214,29 @@ typedef enum {
 	enUSB_DEV_STACK_ATTR_NULL	=	0,
 	enUSB_DEV_STACK_ATTR_PC_SPEAKER,
 	enUSB_DEV_STACK_ATTR_APPLE_LIGHTNING,
-	enUSB_DEV_STACK_ATTR_USB_MICROPHONE
-}	enum_USB_DEVICE_STACK_ATTR;
+	enUSB_DEV_STACK_ATTR_USB_MICROPHONE,
+	enUSB_DEV_STACK_ATTR_USB_MSC
+} enum_USB_DEVICE_STACK_ATTR;
+
+typedef enum {
+	//Telephony Page
+	enHUTTELEPHONY_HOOK	=	0x01,
+	enHUTTELEPHONY_DROP	=	0x04,
+	enHUTTELEPHONY_MUTE	=	0x04
+} enum_USB_HUTTELEPHONY_KEYCODE;
+
+typedef enum {
+	//Consumer Page
+	enHUTCONSUMER_VOLUP		=	0x01,
+	enHUTCONSUMER_VOLDOWN	=	0x02,
+	enHUTCONSUMER_PLAY	=	0x04,
+	enHUTCONSUMER_NEXT	=	0x08,
+	enHUTCONSUMER_PREV	=	0x10,
+	enHUTCONSUMER_STOP	=	0x20,
+	enHUTCONSUMER_FF	=	0x40,
+	enHUTCONSUMER_RW	=	0x80
+} enum_USB_HUTCONSUMER_KEYCODE;
+
 
 int usb_devStart(enum_USB_DEVICE_STACK_ATTR attr);
 int usb_devStop(void);
@@ -215,5 +246,6 @@ int usb_devAudioSampleRate_get(U32 *pSampleRate);
 
 void daudio_SetFBSamplerateCorrection(int value);
 
+
 #endif
 

@@ -39,13 +39,15 @@
 
 #define EX_AUDIO_STREAM_THRESHOLD_FOR_USB_DEV      (EX_AUDIO_DEC_SAMPLES+192*2)
 
+
+
 void audiodata_down_sample_24bit_by_2(U8 *pBuf, U16 len)
 {
 	U8 *pBufD;
 	U16 i;
 	pBufD = pBuf;
 
-	for (i=0; i<(len); i++)
+	for (i=0; i<(len); )
 	{
 		*pBufD++ = *pBuf++;
 		*pBufD++ = *pBuf++;

@@ -43,11 +43,11 @@ typedef enum {
 	enIRP_HUB_POLL,
 	enIRP_HUB_NOTIFY,
 
-	enIRP_OTG_NOTIFY,	//0d
+	enIRP_OTG_NOTIFY, //0d
 
 	enIRP_TYPE_MTP_INT_POLL,
 	enIRP_TYPE_MTP_IF,
-	enIRP_TYPE_MTP_SPECIFIC,	//10
+	enIRP_TYPE_MTP_SPECIFIC, //10
 
 	enIRP_TYPE_IPOD_NOTIFY,
 	enIRP_TYPE_IPOD_PKT_TX,
@@ -59,9 +59,9 @@ typedef enum {
 	enIRP_TYPE_IPOD_BACK2MSC,
 	enIRP_TYPE_IPOD_TIMEOUT,
 	
-	enIRP_TYPE_DEV_START,		//1A
-	enIRP_TYPE_DEV_STOP,		//1B
-	enIRP_TYPE_DEV_SETUP_PKT,	//1C
+	enIRP_TYPE_DEV_START,       //1A
+	enIRP_TYPE_DEV_STOP,        //1B
+	enIRP_TYPE_DEV_SETUP_PKT,   //1C
 
 	enIRP_TYPE_AOA_SET_ZERO_BANDWIDTH,
 	enIRP_TYPE_AOA_START_RX,

@@ -5,6 +5,7 @@
 #include "oem.h"
 
 #include "hw_timer.h"
+#include "hw_da_pp.h"
 
 #include "mem_reloc.h"
 #include "fifo.h"
@@ -18,9 +19,9 @@
 #include "app_cmd.h"
 #include "oem_string.h"
 #include <string.h>
-//#include "app_wave.h"
+#include "app_flash_program.h"
 
-#ifdef MP3_ENCODE_ENABLE
+#if 1//def MP3_ENCODE_ENABLE
 #include "app_mp3_encode.h"
 #endif
 
@@ -45,14 +46,16 @@
 #ifdef BT_HCI_ENABLE
 #include "ht_hci_main.h"
 #endif
+
 #include "app_media.h"
+#include "app_string_oem.h"
 
 #ifdef WAV_DEC
 #include "wave_decode.h"
 #endif
 
 
-#define TASK_HDD_PRIORITY_CHANGE
+//#define TASK_HDD_PRIORITY_CHANGE
 
 
 //#define IDE_BLOCK_SIZE        1024
@@ -65,8 +68,8 @@ volatile U8 task_hdd_check_cnt;
 #endif
 
 
-extern int osentry_HddTaskPriority( void );
-extern int osentry_restoreHdd_TaskPriority( void );
+int osentry_HddTaskPriority( void );
+int osentry_restoreHdd_TaskPriority( void );
 //#pragma section ide_data " " ".fat_file_data1"
 //#pragma use_section ide_data  ide_buf
 
@@ -120,6 +123,7 @@ volatile U8 sd1_FileSysPresent;
 
 extern U16 gwEntryNum;
 extern U16 gwFolderNum;
+extern U32 rec_files_num;
 
 
 U8 media_write_err_cnt;

@@ -21,9 +21,10 @@
 
 #include "usbdev.h"
 
-//#ifndef	OTG_FORCE_FULL_SPEED
+
+#ifndef	OTG_FORCE_FULL_SPEED
 U8 usb_highspeed_flag;
-//#endif
+#endif
 
 
 volatile USB_OTG_REGISTERS * otgRegister;
@@ -52,9 +53,11 @@ void usbotg_isr( void ) __USBHOST_TEXT;
 //int8, dma is int9
 void usbotg_isr( void )
 {
+	//volatile U32 reg32;
+
 	//do
 	{
-/*	volatile U32 reg32;
+		#if 0//it is moved to the file of interrupt.c
 		reg32 = *otgEnhCtrl->ctrl;
 		*otgEnhCtrl->ctrl	&=	~ENH_CTRL_INT_STAT_MASK;
 		reg32 &= ENH_CTRL_INT_STAT_MASK;
@@ -70,7 +73,7 @@ void usbotg_isr( void )
 		}
 		
 		if( reg32 & ENH_CTRL_INT_USB )
-*/		
+		#endif
 		{	
 			otg.curstate = otgRegister->state;
 			
@@ -82,15 +85,15 @@ void usbotg_isr( void )
 				hcd_intProcess();
 			}
 			
-#ifdef USB_DEV_ENABLE
+			#ifdef USB_DEV_ENABLE
 			if( otg.curstate == 0x09 ) //dev
 			{
 				dcd_intProcess();
 			}
-#else
+			#else
 			DBG_assert( otg.curstate != 0x09 ); //dev
 			//dcd_int_process();			
-#endif
+			#endif
 
 			if( otg.curstate != otg.oldstate )
 			{
@@ -112,37 +115,41 @@ void otg_intProcess(void)
 {
 	IRP	*irp = &otg.irp;
 	volatile U8 reg8;
+
+	//DBG_iPrintf("*\n\r");
 	
 	reg8 = (otgRegister->irq & otgRegister->ien);
 	if( reg8 )
 	{
 		otgRegister->irq	=	reg8;
 
-		//DBG_iPrintf("\n---%x\n", reg8);
-		if( reg8 & 0x01 )	//2.16.1: a_idle or b_idle state.
+		//DBG_iPrintf("\n\r%x\n\r", reg8);
+		if( reg8 & 0x01 ) //2.16.1: a_idle or b_idle state.
 		{
 			//DBG_iPrintf("\n---reg8 & 0x01\n");
-			if( otgRegister->state == 0x08 )   //2.16.2: otgstate 0x08 b_idle.
+			if( otgRegister->state == 0x08 ) //2.16.2: b_idle.
 			{	
 				//dev
-				/*
 				otgRegister->ctrl &= ~0x01;
-				*usbdevReg->ctrl->usbcs &= ~0x40;	//disconnect bit, 1 is discon
-				*/
-				otgRegister->ctrl &= ~0x01;			//2.16.3 set otgctrl bit0 to 0, end the session.
-				otgRegister->ctrl |=  0x02;			//JJ+ set bit1 to forces the bus power-down.
-				*usbdevReg->ctrl->usbcs |= 0x40;	//2.18.41 usbcs: discon bit, 1 is discon. JJ+
+				
+				#if 0
+				*usbdevReg->ctrl->usbcs &= ~0x40; //2.18.41: disconnect bit, 1 is discon
+				#else
+				otgRegister->ctrl |=  0x02;       //JJ+
+				*usbdevReg->ctrl->usbcs |= 0x40;  //2.18.41: disconnect bit, 1 is discon. JJ+
+				#endif
+
+				DBG_iPrintf("\n\rPC_discon\n\r");
 
 				if( (otg.curstate == 0x08) && (otg.oldstate == 0x09 ) && dcd_isOpen() )
 				{
 					dcd_hostUnplug();
 
-					//DBG_iPrintf("\n_HOST_DISCON\n");
 					FILL_OTG_IRP( irp, enIRPT_DEV_STACK, IRP_PARAM_HOST_DISCONNECT );
 					usbmsg_isendIRP( irp );
 				}
 			}
-			else								//2.16.1: a_idle.
+			else //2.16.1: a_idle.
 			{
 				//host
 				otgRegister->ctrl &= ~0x02;
@@ -150,17 +157,18 @@ void otg_intProcess(void)
 			}
 		}
 				
-		if( reg8 & 0x08 )	//2.16.1: vbuserrirq, free the bus, then power-down bus.
+		if( reg8 & 0x08 ) //2.16.1: vbuserrirq, free the bus, then power-down bus.
 		{
 			otgRegister->ctrl &= ~0x01;
 			otgRegister->ctrl |= 0x02;
 			//send error msg out ?
 		}
 		
-		if( reg8 & 0x04 )	//2.16.1: a_host or b_host state entering.
+		if( reg8 & 0x04 ) //2.16.1: a_host or b_host state entering.
 		{
 			//DBG_iPrintf("\n---reg8 & 0x04\n");
 			//host --> take this as dev connect			
+			DBG_iPrintf("\n\rPC conn1\n\r");
 			if( otg.curstate == 0x03 )
 			{
 				FILL_OTG_IRP( irp, enIRPT_USBD, IRP_PARAM_DEV_CONNECT );
@@ -174,13 +182,15 @@ void otg_intProcess(void)
 			usbmsg_isendIRP( irp );
 		}
 		
-		if( reg8 & 0x10 )	//2.16.1: a_peri or b_peri state entering.
+		if( reg8 & 0x10 ) //2.16.1: a_peri or b_peri state entering.
 		{
-			//DBG_iPrintf("\n---reg8 & 0x10\n");
+			//DBG_iPrintf("\n\r reg8 & 0x10\n\r");
 			//dev --> take this as host connnect
+			//DBG_iPrintf("\n\r usbDev connected2\n\r");
+			DBG_Printf("\n\rPC conn2\n\r");
 			if( dcd_isOpen() )
 			{
-				//DBG_iPrintf("\n_HOST_CON\n");
+				//DBG_iPrintf("\n\rHOST_CON\n\r");
 				FILL_OTG_IRP( irp, enIRPT_DEV_STACK, IRP_PARAM_HOST_CONNECT );
 				usbmsg_isendIRP( irp );
 			}
@@ -267,60 +277,65 @@ int otg_isHostPlugin( void )
 #endif
 
 
-#define	REG_ADDR(x)		(void*)(USB_DEVICE_BASE_ADDR + x)
-//#define	REG_ADDR(x)		(USB_DEVICE_BASE_ADDR + x)
+#define REG_ADDR(x)    (void*)(USB_DEVICE_BASE_ADDR + x)
+//#define REG_ADDR(x)    (USB_DEVICE_BASE_ADDR + x)
 
 
 const ENDPOINT0_REGS endp0Addr = {
 	REG_ADDR(0x00),	REG_ADDR(0x01),	REG_ADDR(0x02),	
 	REG_ADDR(0xc0),	REG_ADDR(0xc1),	REG_ADDR(0xc3),	REG_ADDR(0x1e0),	
-	REG_ADDR(0x180), REG_ADDR(0x140), REG_ADDR(0x100)
+	REG_ADDR(0x180),REG_ADDR(0x140), REG_ADDR(0x100)
 };
 
-
-
+//in the host mode: rx, in the device mode: tx 
 const ENDPOINT_REGS	endp1RxAddr	=	{
 	REG_ADDR(0x08),	REG_ADDR(0x0b),	REG_ADDR(0x0a),
 	REG_ADDR(0xc6),	REG_ADDR(0xc7),	
-	REG_ADDR(0x1e2), REG_ADDR(0x304),
+	REG_ADDR(0x1e2),REG_ADDR(0x304),
 	REG_ADDR(0x84),	REG_ADDR(0x84),	REG_ADDR(0x84)
 };
 
+//in the host mode: tx, in the device mode: rx 
+const ENDPOINT_REGS	endp1TxAddr	=	{
+	REG_ADDR(0x0c),	REG_ADDR(0x0f),	REG_ADDR(0x0e),
+	REG_ADDR(0xc4),	REG_ADDR(0xc5),	
+	REG_ADDR(0x3e2),REG_ADDR(0x344),
+	REG_ADDR(0x84),	REG_ADDR(0x84),	REG_ADDR(0x84)
+};
+
+//in the host mode: rx, in the device mode: tx 
 const ENDPOINT_REGS	endp2RxAddr	=	{
 	REG_ADDR(0x10),	REG_ADDR(0x13),	REG_ADDR(0x12),
 	REG_ADDR(0xca),	REG_ADDR(0xcb),	
-	REG_ADDR(0x1e4),	REG_ADDR(0x308),
+	REG_ADDR(0x1e4),REG_ADDR(0x308),
 	REG_ADDR(0x88),	REG_ADDR(0x88),	REG_ADDR(0x88)
 };
 
+//in the host mode: tx, in the device mode: rx 
+const ENDPOINT_REGS	endp2TxAddr	=	{
+	REG_ADDR(0x14),	REG_ADDR(0x17),	REG_ADDR(0x16),
+	REG_ADDR(0xc8),	REG_ADDR(0xc9),	
+	REG_ADDR(0x3e4),REG_ADDR(0x348),
+	REG_ADDR(0x88),	REG_ADDR(0x88),	REG_ADDR(0x88)
+};
+
+#if 1//( (defined USB_HOST_ENABLE || defined USB_DEV_ENABLE) && (defined HID_FUNC_ENABLE) )
+//in the host mode: rx, in the device mode: tx 
 const ENDPOINT_REGS	endp3RxAddr	=	{   //ep3 Rx=Host OUT byte counter, cs, con,...
-	//REG_ADDR(0x18),	REG_ADDR(0x13),	REG_ADDR(0x1b), //JJ
 	REG_ADDR(0x18),	REG_ADDR(0x1b),	REG_ADDR(0x1a),
 	REG_ADDR(0xce),	REG_ADDR(0xcf),	
 	REG_ADDR(0x1e6), REG_ADDR(0x30c),//2.17.20 HC INx Max, 2.18.47 outxstaddr
 	REG_ADDR(0x8c),	REG_ADDR(0x8c),	REG_ADDR(0x8c)
 };
 
-const ENDPOINT_REGS	endp1TxAddr	=	{
-	REG_ADDR(0x0c),	REG_ADDR(0x0f),	REG_ADDR(0x0e),
-	REG_ADDR(0xc4),	REG_ADDR(0xc5),	
-	REG_ADDR(0x3e2), REG_ADDR(0x344),
-	REG_ADDR(0x84),	REG_ADDR(0x84),	REG_ADDR(0x84)
-};
-
-const ENDPOINT_REGS	endp2TxAddr	=	{
-	REG_ADDR(0x14),	REG_ADDR(0x17),	REG_ADDR(0x16),
-	REG_ADDR(0xc8),	REG_ADDR(0xc9),	
-	REG_ADDR(0x3e4), REG_ADDR(0x348),
-	REG_ADDR(0x88),	REG_ADDR(0x88),	REG_ADDR(0x88)
-};
-
+//in the host mode: tx, in the device mode: rx 
 const ENDPOINT_REGS	endp3TxAddr	=	{   //ep3 Tx=Host IN byte counter, cs, con,... !!!
 	REG_ADDR(0x1c),	REG_ADDR(0x1f),	REG_ADDR(0x1e),
 	REG_ADDR(0xcc),	REG_ADDR(0xcd),	
 	REG_ADDR(0x3e6), REG_ADDR(0x34c),//2.17.22 HC OUTx Max, 2.18.48 inxstaddr
 	REG_ADDR(0x8c),	REG_ADDR(0x8c),	REG_ADDR(0x8c)
 };
+#endif
 
 
 
@@ -348,6 +363,7 @@ void loopdelay( U32 t )
 
 void otg_phy_set(BOOL bHost_Dev)
 {
+#if 1//def USB_CONFIG
 	//for the 3rd Generation Chip
     volatile U32 tmp,val;
 
@@ -414,6 +430,7 @@ void otg_phy_set(BOOL bHost_Dev)
 	//usbphy_config->utmi_vbus_src = 0;
 	usbphy_config->utmi_vbus_src = 1;
 	REG_MISC_USBPHY = tmp;
+#endif
 
 }
 
@@ -444,8 +461,10 @@ int otg_init( void )
 	usbhostReg->endp2In		=	(ENDPOINT_REGS*)&endp2RxAddr;
 	usbhostReg->endp2Out	=	(ENDPOINT_REGS*)&endp2TxAddr;
 
+#if 1//( (defined USB_HOST_ENABLE) && (defined HID_FUNC_ENABLE) )
 	usbhostReg->endp3In		=	(ENDPOINT_REGS*)&endp3RxAddr;	//HID
 	usbhostReg->endp3Out	=	(ENDPOINT_REGS*)&endp3TxAddr;
+#endif
 
 	usbhostReg->ctrl		=	(COMMON_CTRL_REG*)&commCtlAddr;
 	usbhostReg->irq			=	(USB_IRQ_REGS*)&irqAddr;
@@ -460,8 +479,11 @@ int otg_init( void )
 	usbdevReg->endp2In		=	(ENDPOINT_REGS*)&endp2TxAddr;   //ep2 0x82, Mic,*endp2In, IN in dcd_open()
 	usbdevReg->endp2Out		=	(ENDPOINT_REGS*)&endp2RxAddr;   //useless !
 
+#if 1//( (defined USB_DEV_ENABLE) && (defined HID_FUNC_ENABLE) )
+	//HID Int Input
 	usbdevReg->endp3In		=	(ENDPOINT_REGS*)&endp3TxAddr;   //ep3 0x83, HID,*endp3In, IN in dcd_open()
 	usbdevReg->endp3Out		=	(ENDPOINT_REGS*)&endp3RxAddr;   //useless !
+#endif
 
 	usbdevReg->ctrl			=	(COMMON_CTRL_REG*)&commCtlAddr;
 	usbdevReg->irq			=	(USB_IRQ_REGS*)&irqAddr;
@@ -479,8 +501,15 @@ int otg_init( void )
 int otg_init_for_dev( void )
 {
 	int ret;
-	DBG_Printf("+++++++++++++++ %s\n\r", __func__);
+	DBG_Printf("%s\n\r", __func__);
 
+	#if 1
+	DBG_Printf("%s\n\r", optek_lib_usb_device_version_get());
+	delayms(2);
+	//DBG_Printf("%s\n\r", optek_lib_usb_device_date_get());
+	//DBG_Printf("%s\n\r", optek_lib_usb_device_time_get());
+	#endif
+	
 	otg_phy_set(FALSE);	//Dev
 
 	otgRegister	=	(USB_OTG_REGISTERS *)USB_OTG_BASE_ADDR;
@@ -497,17 +526,41 @@ int otg_init_for_dev( void )
 	usbdevReg	=	&usbDevRegs;
 
 
+#if 0 //By JJ
+	usbhostReg->endp0		=	(ENDPOINT0_REGS*)&endp0Addr;
+	usbhostReg->endp1In		=	(ENDPOINT_REGS*)&endp1RxAddr;
+	usbhostReg->endp1Out	=	(ENDPOINT_REGS*)&endp1TxAddr;
+	usbhostReg->endp2In		=	(ENDPOINT_REGS*)&endp2RxAddr;
+	usbhostReg->endp2Out	=	(ENDPOINT_REGS*)&endp2TxAddr;
+
+#if ( (defined USB_DEV_ENABLE) && (defined HID_FUNC_ENABLE) )
+	usbhostReg->endp3In		=	(ENDPOINT_REGS*)&endp3RxAddr;	//HID
+	usbhostReg->endp3Out	=	(ENDPOINT_REGS*)&endp3TxAddr;
+#endif
+
+	usbhostReg->ctrl		=	(COMMON_CTRL_REG*)&commCtlAddr;
+	usbhostReg->irq			=	(USB_IRQ_REGS*)&irqAddr;
+
+	usbhostReg->portctrl	=	(U8*)REG_ADDR(0x1ab);   //0x1ab [des] 2.17.6 hcportctrl 
+	usbhostReg->framenum	=	(U16*)REG_ADDR(0x1ac);  //0x1ac [des] 2.17.7 hcfrmnrl 
+	usbhostReg->frameRemain	=	(U16*)REG_ADDR(0x1ae);  //0x1ae [des] 2.17.8 hcfrmnrh
+#endif
+
+
 	usbdevReg->endp0		=	(ENDPOINT0_REGS*)&endp0Addr;    //rxbc, txbc, cs, ... setupdat, rxdata, txdata
 
 	usbdevReg->endp1In		=	(ENDPOINT_REGS*)&endp1TxAddr;   //useless !
 
-	usbdevReg->endp1Out		=	(ENDPOINT_REGS*)&endp1RxAddr;   //ep1 0x01, Spk,*endp1Out,Out for Device in dcd_open()
-	usbdevReg->endp2In		=	(ENDPOINT_REGS*)&endp2TxAddr;   //ep2 0x82, Mic,*endp2In, IN in dcd_open()
+	usbdevReg->endp1Out		=	(ENDPOINT_REGS*)&endp1RxAddr;   //ep1 0x01, Spk Out from host,*endp1Out,Out for Device in dcd_open()
+	usbdevReg->endp2In		=	(ENDPOINT_REGS*)&endp2TxAddr;   //ep2 0x82, Mic In to host,*endp2In, IN in dcd_open()
 
 	usbdevReg->endp2Out		=	(ENDPOINT_REGS*)&endp2RxAddr;   //useless !
 
+#if 1//( (defined USB_DEV_ENABLE) && (defined HID_FUNC_ENABLE) )
+	//HID Int Input
 	usbdevReg->endp3In		=	(ENDPOINT_REGS*)&endp3TxAddr;   //ep3 0x83, HID,*endp3In, IN in dcd_open()
 	usbdevReg->endp3Out		=	(ENDPOINT_REGS*)&endp3RxAddr;   //useless !
+#endif
 
 	usbdevReg->ctrl			=	(COMMON_CTRL_REG*)&commCtlAddr;
 	usbdevReg->irq			=	(USB_IRQ_REGS*)&irqAddr;
@@ -547,7 +600,7 @@ int otg_open( void )
 #if 1//def OPTEK_SOC2_VERSION
 	for( i = 0; i < 1; i ++ )
 	{
-#ifdef OTG_FORCE_FULL_SPEED
+	#ifdef OTG_FORCE_FULL_SPEED
 		reg32 = ENH_CTRL_PHY_CLK_ENA|ENH_CTRL_PHY_REG_ENA|ENH_CTRL_PHY_PLL_ENA|ENH_CTRL_DIS_HSPEED | ENH_CTRL_PHY_NO_SUSPEND;
 		*otgEnhCtrl->ctrl = reg32;
 		timer_delayms(10);
@@ -556,11 +609,11 @@ int otg_open( void )
 
 		timer_delayms(10);
 		reg32 = ENH_CTRL_PHY_CLK_ENA|ENH_CTRL_PHY_REG_ENA|ENH_CTRL_PHY_PLL_ENA|ENH_CTRL_DIS_HSPEED | ENH_CTRL_PHY_NO_SUSPEND;
-#else
+	#else
 
-#ifndef OTG_FORCE_FULL_SPEED
+		#ifndef OTG_FORCE_FULL_SPEED
 		if (usb_highspeed_flag)
-#endif
+		#endif
 		{
 			DBG_Puts("USB high speed\n\n\r");
 
@@ -574,7 +627,7 @@ int otg_open( void )
 			timer_delayms(10);
 			reg32 = ENH_CTRL_PHY_CLK_ENA|ENH_CTRL_PHY_REG_ENA|ENH_CTRL_PHY_PLL_ENA| ENH_CTRL_PHY_NO_SUSPEND;
 		}
-#ifndef OTG_FORCE_FULL_SPEED
+		#ifndef OTG_FORCE_FULL_SPEED
 		else
 		{
 			DBG_Puts("USB full speed\n\r");
@@ -588,9 +641,9 @@ int otg_open( void )
 			timer_delayms(10);
 			reg32 = ENH_CTRL_PHY_CLK_ENA|ENH_CTRL_PHY_REG_ENA|ENH_CTRL_PHY_PLL_ENA|ENH_CTRL_DIS_HSPEED | ENH_CTRL_PHY_NO_SUSPEND;
 		}
-#endif
+		#endif
 
-#endif
+		#endif
 
 		reg32 |= (ENH_CTRL_INT_USB<<ENH_CTRL_INT_ENA_SHIFT) ;
 		*otgEnhCtrl->ctrl = reg32;
@@ -629,10 +682,10 @@ int otg_open( void )
 
 #ifdef USB_DEV_ENABLE
 	//patch for device mode
-	otgRegister->ctrl = 0x00;
+	//otgRegister->ctrl = 0x00;
 #endif
 
-	#if 0//it is moved to the dstack.c of library of optek_lib_usb_device.a
+	#if 1//it is moved to the library
 	USB_INT_ENABLE;
 	#endif
 
@@ -647,7 +700,7 @@ int otg_open( void )
 
 int otg_close( void )
 {
-	DBG_Printf("----------------- %s\n\r", __func__);
+	DBG_Printf("%s\n\r", __func__);
 
 	USB_INT_DISABLE;
 	otgRegister->ien = 0x00;

@@ -2,12 +2,13 @@
 #define	__OTG_H__
 
 
+#include "interrupt.h"
 #include "wave_decode.h"
 
 
-#if 0// HS			( (defined WAV_DEC) && (defined WAV_192K_SUPPORT) )
+#if 0//( (defined WAV_DEC) && (defined WAV_192K_SUPPORT) )
 #undef OTG_FORCE_FULL_SPEED
-#else// FS
+#else
 #define OTG_FORCE_FULL_SPEED
 #endif
 
@@ -75,6 +76,7 @@ typedef struct {
 #define	USB_ORG_REGFILE_SIZE	(12)
 
 
+//usbhs_otg_sd_des.pdf
 
 typedef	struct {
 	volatile U8 * rxbc;		    //dev out, host in  //0x00 [des] 2.18.1 out0bc/hcin0bc
@@ -155,8 +157,10 @@ typedef	struct {
 	ENDPOINT_REGS	*endp2In;    //data IN
 	ENDPOINT_REGS	*endp2Out;
 
+#if	1//( (defined USB_DEV_ENABLE) && (defined HID_FUNC_ENABLE) )
 	ENDPOINT_REGS	*endp3In;    //data IN for HID
 	ENDPOINT_REGS	*endp3Out;
+#endif
 
 	USB_IRQ_REGS	*irq;
 	
@@ -176,8 +180,10 @@ typedef	struct {
 	ENDPOINT_REGS	*endp2In;
 	ENDPOINT_REGS	*endp2Out;
 
+#if	1//( (defined USB_HOST_ENABLE) || (defined HID_FUNC_ENABLE) )
 	ENDPOINT_REGS	*endp3In;	//HID
 	ENDPOINT_REGS	*endp3Out;
+#endif
 
 	USB_IRQ_REGS	*irq; //see const USB_IRQ_REGS	irqAddr in otg.c
 

@@ -44,6 +44,7 @@ void task_usbotg(void *pvParameters)
 #ifdef USB_INT_CHANGEs_TO_LEVEL1
 	SOFT5_INT_ENABLE;
 #endif
+
 /*
 #ifdef USB_DEV_ENABLE
 	usbd_init();
@@ -89,7 +90,7 @@ void task_usbotg(void *pvParameters)
 		{
 		case enIRP_USB_OPEN:
 
-#if 0
+		#if 0
 			usbd_init();
 			usbd_open();
 
@@ -98,11 +99,11 @@ void task_usbotg(void *pvParameters)
 
 			otg_init();
 			otg_open();
-#endif
+		#endif
 
-#ifndef	OTG_FORCE_FULL_SPEED
+		#ifndef	OTG_FORCE_FULL_SPEED
 			usb_highspeed_flag = TRUE;
-#endif
+		#endif
 
 			irp->target	=	enIRPT_USBD;
 			irp->type	=	enIRP_USBHOST_START;
@@ -122,7 +123,7 @@ void task_usbotg(void *pvParameters)
 				(*irp->complete) ( irp->result, irp->actualLen );
 			}
 
-#if 0
+		#if 0
 			//usbd_fini();
 			//usbd_clsoe();
 
@@ -131,16 +132,16 @@ void task_usbotg(void *pvParameters)
 
 			//otg_fini();
 			otg_close();
-#endif
+		#endif
 
 			break;
 
 		case enIRPT_USBD:
 			//DBG_Printf("enIRPT_USBD\n");
 			
-#ifndef	OTG_FORCE_FULL_SPEED
+		#ifndef	OTG_FORCE_FULL_SPEED
 			usb_highspeed_flag = TRUE;
-#endif
+		#endif
 
 			usbd_IRPprocess( irp );
 			if( irp->complete != NULL )
@@ -157,13 +158,13 @@ void task_usbotg(void *pvParameters)
 			break;
 
 
-#if 0
+	#if 0
 		case enIRPT_HUB:
 			hub_IRPprocess( irp );
 			break;
-#endif
+	#endif
 			
-#ifdef	PTP_MTP_CLASS
+	#ifdef PTP_MTP_CLASS
 		case enIRPT_MTP:
 			mtpClass_IRPprocess( irp );
 			if( irp->complete != NULL )
@@ -171,13 +172,13 @@ void task_usbotg(void *pvParameters)
 				(*irp->complete) ( irp->result, irp->actualLen );
 			}
 			break;
-#endif
+	#endif
 
-#ifdef	USB_DEV_ENABLE
+	#ifdef USB_DEV_ENABLE
 		case enIRPT_DEV_STACK:
-#ifndef	OTG_FORCE_FULL_SPEED
+		#ifndef	OTG_FORCE_FULL_SPEED
 			usb_highspeed_flag = TRUE;
-#endif
+		#endif
 
 			dstk_IRPprocess( irp );
 			if( irp->complete != NULL )
@@ -185,9 +186,9 @@ void task_usbotg(void *pvParameters)
 				(*irp->complete) ( irp->result, irp->actualLen );
 			}
 			break;
-#endif
+	#endif
 
-#ifdef	APPLE_IAP2_STACK
+	#ifdef APPLE_IAP2_STACK
 		case enIRPT_IAP2:
 			iap2stk_IRPprocess( irp );
 			if( irp->complete != NULL )
@@ -195,7 +196,7 @@ void task_usbotg(void *pvParameters)
 				(*irp->complete) ( irp->result, irp->actualLen );
 			}
 			break;
-#endif
+	#endif
 
 		default:
 			HALT;

@@ -345,7 +345,7 @@ typedef struct _AUDIO_STREAM_INTF {
 
 //The "IPOD_USB_AUDIO" macro is defined in the file of "oem_drogon.h"
 //the head file must use the macro below.
-#if 1//def IPOD_USB_AUDIO
+#if (defined AOA_USB_AUDIO || defined USB_HOST_AUDIO_ENABLE)
 
 struct _IPOD_DEVICE;
 
@@ -386,11 +386,23 @@ typedef struct _USB_DEVICE {
 //	U32	tmpConfigBufTotalLen;
 //	U32	tmpConfigTotalLen;
 
-#if 1//(defined AOA_USB_AUDIO || defined USB_HOST_AUDIO_ENABLE)
-#define	CONFIG_BUF_SIZE     256 /*changed for AOA & USB Host Audio*/
-#else
-#define	CONFIG_BUF_SIZE		64
-#endif
+	#if 1
+	#if 1//(defined AOA_USB_AUDIO || defined USB_HOST_AUDIO_ENABLE)
+	#define	CONFIG_BUF_SIZE     256 /*changed for AOA & USB Host Audio*/
+	#else
+	#define	CONFIG_BUF_SIZE		64
+	#endif
+	#endif
+	
+	#if 0
+	#if 1//(defined AOA_USB_AUDIO || defined USB_HOST_AUDIO_ENABLE)
+	#define	CONFIG_BUF_SIZE     512 /*changed for AOA & USB Host Audio*/
+	//#define CONFIG_BUF_SIZE     384 /*changed for AOA & USB Host Audio*/
+	#else
+	#define CONFIG_BUF_SIZE     64
+	#endif
+	#endif
+	
 	//CONFIG despt + audioCtl i/f despt + 2x audioStream i/f despt + hid i/f
 
 	U8	activeConfigVal;

@@ -134,6 +134,7 @@ U8 usbmsc_stopUSBhost( void )
 
 	if (!usbmsc_USBhostOpened)
 	{
+		DBG_TPrintf ("usbHost wasn't opened\n\r");
 		return TRUE;
 	}
 
@@ -236,7 +237,7 @@ U8 usbmsc_USBhostOpenEx( enum_USB_HOST_STACK_ATTR attr )
 	}
 	else
 	{
-		DBG_Printf ("USB is open\n\r");
+		DBG_Printf ("usbHost opened\n\r");
 	}
 
 	return TRUE;

+#include "c_def.h"
+#include "oem.h"
+#include "debug.h"
+
+
+#if 1//def IPOD_USB_AUDIO
+
+#define	MAX_RANGES		6
+U8	utf8Byte0Range[MAX_RANGES]	=	{
+	0x7F,			//1 byte
+	0xc0,			//2 byte	-
+	0xe0,			//3 byte	-	
+	0xf0,			//4 byte
+	0xf8,			//5
+	0xfc			//6
+};
+
+
+//don't do much check
+static int getSize( U8 *utf8 )
+{
+	int i;
+
+	for( i = 1; i < MAX_RANGES; i ++ ) {
+		if( utf8[0] < utf8Byte0Range[i] )	break;
+	}
+
+	if( (i == 1 ) && (utf8[0] > utf8Byte0Range[0]) )	i = 100;	//make it err
+
+	return i;
+}
+
+//bigEndian
+static U16 decodeWord( U8 **utf8 )
+{
+	U8	*ptr	=	*utf8;
+	int size;
+	U16	tmp;
+
+	size	=	getSize( ptr );
+	switch( size ) {
+	case 1:
+		tmp	=	ptr[0];
+		*utf8 += 1;
+		break;
+
+	case 2:
+		tmp	=	ptr[0] & 0x1f;
+		tmp <<=	6;
+		tmp |=	ptr[1] & 0x3f;
+		
+		*utf8 +=	2;
+		break;
+
+	case 3:
+		tmp	=	ptr[0] & 0x0f;
+		tmp <<=	6;
+		tmp |=	ptr[1] & 0x3f;
+		tmp <<=	6;
+		tmp |=	ptr[2] & 0x3f;
+
+		*utf8 +=	3;
+		break;
+
+	default:
+		//err
+		tmp	=	0;
+	}
+
+	return tmp;
+}
+
+//len is size in bytes
+//maxlen/len16 is size in U16
+//len16 include terminal null \0\0
+int utf8_toUcs16( U8 *utf8, int len, U16 *ucs16, int maxlen )
+{
+	int len16	=	0;
+	U16	t16;
+	U8	*ptr	=	utf8;
+	
+	do {
+		t16	=	decodeWord( &ptr );
+		if (t16 == 0)
+		{
+			break;
+		}
+		
+		*ucs16	++	=	t16;
+
+#if 0
+		if( ++len16 >= maxlen ) {
+			--ucs16;
+			*ucs16	=	0;
+			break;
+		}
+#else
+ 		if( len16 > maxlen ) {
+ 			*ucs16	=	0;
+			break;
+		}
+
+		len16++;
+#endif
+	} while( t16 != 0 );
+
+
+#if 1
+	return len16;
+#else
+	if (len16 > 0)
+	{
+		len16 -= 1; 
+	}
+	
+	return len16;
+#endif
+}
+
+
+#endif //IPOD_USB_AUDIO

+#ifndef	__UTF8_H__
+#define	__UTF8_H__
+
+
+//len is size in bytes
+//maxlen/len16 is size in U16
+//len16 include terminal null \0\0
+int utf8_toUcs16( U8 *utf8, int len, U16 *ucs16, int maxlen );
+
+
+#endif //__UTF8_H__