X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Ftarget%2Fcmnos%2Fdbg_api.c;h=2391034452e30f121d529db3b081538afc33de04;hb=24b5105e0730aaeffb8a7b0b6b0d93eec6190b86;hp=d6e96bb04327e4ac10facdd1d96e21162ba89213;hpb=8564cbf08ef61bd2fad82b48f0e7276744b44b1f;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
index d6e96bb..2391034 100755
--- a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
+++ b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
@@ -32,9 +32,14 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <rom.h>
+
 #include "sys_cfg.h"
 #include "athos_api.h"
 
+#include "adf_os_io.h"
+
 #if defined(PROJECT_K2)
 #if SYSTEM_MODULE_SFLASH
 #include "sflash_api.h"
@@ -128,6 +133,37 @@ static void db_unknown_command(void)
 	A_PRINTF("Error! Unknown command.\n\r");
 }
 
+static void db_print_dump(const char *mem1, const char *mem2)
+{
+	unsigned int i = 0;
+	const char *tmp;
+
+	do {
+		if (i == 0) {
+			A_PRINTF("\n\r%06x: ", mem1);
+			tmp = mem1;
+		}
+
+		A_PRINTF("%04x ", *(uint16_t *)mem1);
+
+		mem1 += 2;
+		i++;
+
+		if (i == 8) {
+			A_PRINTF(" ");
+			do {
+				if (*tmp > 0x20 && *tmp < 0x7e)
+					A_PRINTF("%c", *tmp);
+				else
+					A_PRINTF(".");
+				tmp++;
+			} while (tmp < mem1);
+			i = 0;
+		}
+	} while (mem1 < mem2);
+	A_PRINTF("\n\r");
+}
+
 static void zf_debug_init(void)
 {
 	uint8_t ch;
@@ -424,12 +460,12 @@ static int db_ldr_cmd(char *cmd, char *param1, char *param2, char *param3)
 			addr &= 0xfffffffc;
 			//val = *(unsigned long *)addr;
 
-			val = HAL_WORD_REG_READ(addr);
+			val = ioread32(addr);
 		}
 		else if (strcmp(cmd, "LDRH") == 0)
 		{
 			addr &= 0xfffffffe;
-			val = HAL_HALF_WORD_REG_READ(addr);
+			val = ioread16(addr);
 		}
 		else if (strcmp(cmd, "LDRB") == 0)
 		{
@@ -460,23 +496,21 @@ static int db_str_cmd(char *cmd, char *param1, char *param2, char *param3)
 		if (strcmp(cmd, "STR") == 0)
 		{
 			addr &= 0xfffffffc;
-			//HAL_WORD_REG_WRITE(addr, val);
-			HAL_WORD_REG_WRITE(addr, val);
-			//*(volatile unsigned long *)(addr & 0xfffffffc) = (unsigned long)val;
+			iowrite32(addr, val);
 		}
 
 		else if (strcmp(cmd, "STRH") == 0)
 		{
 			addr &= 0xfffffffe;
 			//*(volatile unsigned short *)(addr & 0xfffffffe) = (unsigned short)val;
-			HAL_HALF_WORD_REG_WRITE(addr, val);
+			iowrite16(addr, val);
 		}
 		else if (strcmp(cmd, "STRB") == 0)
 		{
 			if( addr & 0x00f00000 )
-				HAL_BYTE_REG_WRITE(addr, val);
+				iowrite8(addr, val);
 			else
-				HAL_BYTE_REG_WRITE(addr^3, val);
+				iowrite8(addr^3, val);
 			//*(volatile unsigned char *)addr = (unsigned char)val;
 		}
 
@@ -596,7 +630,7 @@ static void clk_change(uint32_t clk, uint32_t ratio, uint32_t baud)
 		break;
 	}
 
-	HAL_WORD_REG_WRITE(0x50040, (0x300|clk_sel|(ratio>>1)<<12));
+	iowrite32(0x50040, (0x300|clk_sel|(ratio>>1)<<12));
 	A_UART_HWINIT((clk*1000*1000)/ratio, baud);
 
 }
@@ -762,26 +796,21 @@ static int db_wdt_cmd(char *cmd, char *param1, char *param2, char *param3)
         else if( strcmp(param1, "event") == 0 )
         {
 		uint32_t event= 0x00123400;
-#define USB_BYTE_REG_WRITE(addr, val)       	HAL_BYTE_REG_WRITE(USB_CTRL_BASE_ADDRESS|(uint8_t)(addr^3), (val))
-#define USB_BYTE_REG_READ(addr)             	HAL_BYTE_REG_READ(USB_CTRL_BASE_ADDRESS|(uint8_t)(addr^3))
-
-#define USB_WORD_REG_WRITE(addr, val)       	HAL_WORD_REG_WRITE(USB_CTRL_BASE_ADDRESS|(uint32_t)(addr), (val))
-#define USB_WORD_REG_READ(addr)             	HAL_WORD_REG_READ(USB_CTRL_BASE_ADDRESS|(uint32_t)(addr))
 
-		// disable ep3 intr
-		USB_BYTE_REG_WRITE(0x17, USB_BYTE_REG_READ(0x17)|0xc0);
+		/* disable ep3 intr */
+		iowrite8_usb(0x17, ioread8_usb(0x17)|0xc0);
 
-		//ZM_CBUS_FIFO_SIZE_REG = 0xf;
-		USB_WORD_REG_WRITE(0x100, 0x0f);
+		/* ZM_CBUS_FIFO_SIZE_REG = 0xf */
+		iowrite32_usb(0x100, 0x0f);
 
-		//ZM_EP3_DATA_REG = event;
-		USB_WORD_REG_WRITE(0xF8, event);
+		/* ZM_EP3_DATA_REG = event; */
+		iowrite32_usb(0xF8, event);
 
-		// tx done
-		USB_BYTE_REG_WRITE(0xAE, USB_BYTE_REG_READ(0xAE)|0x08);
+		/* tx done */
+		iowrite8_usb(0xAE, ioread8_usb(0xAE) | 0x08);
 
-		// enable ep3 intr
-		USB_BYTE_REG_WRITE(0x17, USB_BYTE_REG_READ(0x17)&0xbf);
+		/* enable ep3 intr */
+		iowrite8_usb(0x17, ioread8_usb(0x17) & 0xbf);
         }
 }
 
@@ -967,25 +996,11 @@ static int db_cmd_memcmp(char *cmd, char *param1, char *param2, char *param3)
 /* Memory Dump */
 static int db_cmd_memdump(char *cmd, char *param1, char *param2, char *param3)
 {
-	A_UINT32            i;
-	unsigned long       addr1, addr2, t_addr;
-	A_UINT32            *val;
+	unsigned long       addr1, addr2;
 
 	if (db_ascii_to_hex(param1, &addr1) != -1 && db_ascii_to_hex(param2, &addr2) != -1 && addr1 < addr2 && addr1%4 == 0)
 	{
-		A_PRINTF("addr    data     data     data     data     data     data     data     data\n\r");
-		A_PRINTF("======  ======== ======== ======== ======== ======== ======== ======== ========");
-
-		for (i = 0, t_addr = addr1; t_addr < addr2; i++, t_addr += 4)
-		{
-			if ((i%8) == 0)
-				A_PRINTF("\n\r%06X  ", t_addr);
-
-			val = (A_UINT32 *)t_addr;
-			A_PRINTF("%08X ", *val);
-		}
-
-		A_PRINTF("\n\r");
+		db_print_dump((const char *)addr1, (const char *)addr2);
 		return 0;
 	}