X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Ftarget%2Finit%2Fapp_start.c;h=563d4dec5e47a94778cf8bb3f6226f80f6dde5c2;hb=fa01d2797b39c4365c5176cd870b40a03dfe7a35;hp=64552aaf7fdb511c0ce5e90029582d1935fc52c4;hpb=e9e39b3bf6b4de3b609a5e4ec941254aecfe5cf4;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/magpie_fw_dev/target/init/app_start.c b/target_firmware/magpie_fw_dev/target/init/app_start.c
index 64552aa..563d4de 100644
--- a/target_firmware/magpie_fw_dev/target/init/app_start.c
+++ b/target_firmware/magpie_fw_dev/target/init/app_start.c
@@ -44,12 +44,12 @@
 #define ALLOCRAM_SIZE        ( SYS_RAM_SZIE - ( ALLOCRAM_START - SYS_D_RAM_REGION_0_BASE) - SYS_D_RAM_STACK_SIZE)
 
 // support for more than 64 bytes on command pipe
-extern void vUsb_Reg_Out_patch(void);
+extern void usb_reg_out_patch(void);
 extern int _HIFusb_get_max_msg_len_patch(hif_handle_t handle, int pipe);
 extern void _HIFusb_isr_handler_patch(hif_handle_t h);
 extern BOOLEAN bSet_configuration_patch(void);
 extern void vUSBFIFO_EP6Cfg_FS_patch(void);
-extern void vUsb_Status_In_patch(void);
+extern void usb_status_in_patch(void);
 extern void _fw_usbfifo_init(USB_FIFO_CONFIG *pConfig);
 extern void zfTurnOffPower_patch(void);
 extern void zfResetUSBFIFO_patch(void);
@@ -128,13 +128,13 @@ void app_start()
 	A_PRINTF(" A_WDT_INIT()\n\r");
 
 #if defined(PROJECT_K2)
-	save_cmnos_printf = (uint32_t) fw_cmnos_printf;
+	save_cmnos_printf = fw_cmnos_printf;
 #endif
 
 	if( hostif == HIF_USB ) {
 #if defined(PROJECT_K2)
 #if MOVE_PRINT_TO_RAM
-		save_cmnos_printf = (uint32_t) _indir_tbl.cmnos.printf._printf;
+		save_cmnos_printf = _indir_tbl.cmnos.printf._printf;
 		_indir_tbl.cmnos.printf._printf = fw_cmnos_printf;
 #endif
 		_indir_tbl.cmnos.usb._usb_fw_task = _fw_usb_fw_task;
@@ -187,10 +187,10 @@ void app_start()
 
 	if( hostif == HIF_USB ) {
 		_indir_tbl.hif._get_max_msg_len = _HIFusb_get_max_msg_len_patch;
-		_indir_tbl.cmnos.usb._usb_reg_out = vUsb_Reg_Out_patch;
+		_indir_tbl.cmnos.usb._usb_reg_out = usb_reg_out_patch;
 		_indir_tbl.hif._isr_handler = _HIFusb_isr_handler_patch;
 		_indir_tbl.cmnos.usb._usb_set_configuration = bSet_configuration_patch;
-		_indir_tbl.cmnos.usb._usb_status_in = vUsb_Status_In_patch;
+		_indir_tbl.cmnos.usb._usb_status_in = usb_status_in_patch;
 		_indir_tbl.cmnos.usb._usb_get_descriptor = bGet_descriptor_patch;
 		_indir_tbl.cmnos.usb._usb_standard_cmd = bStandardCommand_patch;
 		_indir_tbl.usbfifo_api._init = _fw_usbfifo_init;
@@ -209,7 +209,8 @@ void app_start()
 
 #ifdef FUSION_USB_ENABLE_TX_STREAM
 		// For K2, enable tx stream mode
-		A_PRINTF("Enable Tx Stream mode\r\n");
+		A_PRINTF("Enable Tx Stream mode: 0x%x\r\n",
+			USB_WORD_REG_READ(ZM_SOC_USB_MODE_CTRL_OFFSET));
 
 		// Patch for K2 USB STREAM mode
 		USB_WORD_REG_WRITE(ZM_SOC_USB_MODE_CTRL_OFFSET, \
@@ -266,6 +267,8 @@ void app_start()
 	else if (hostif == HIF_PCI )
 		hif_pci_patch_install(&_indir_tbl.hif);
 #endif
+		A_PRINTF("USB mode: 0x%x\r\n",
+			USB_WORD_REG_READ(0x100));
 
 	// patch the clock function
 	if(1) {