X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest_sg.c;h=357f4366523fe5e4d4788a9bf3d7739c38685860;hb=e82da443bf0f113f7fc3cad71322a69f0db22360;hp=19a2ef510e0a156d4d7972e35220a80c7776f6df;hpb=2dc7d9f4ec376f9c53dbb9a0413a0b0161378d0a;p=fw%2Fstlink

diff --git a/src/test_sg.c b/src/test_sg.c
index 19a2ef5..357f436 100644
--- a/src/test_sg.c
+++ b/src/test_sg.c
@@ -89,23 +89,23 @@ int main(int argc, char *argv[]) {
 #define LED_GREEN	(1<<9) // pin 9
 	stlink_read_mem32(sl, GPIOC_CRH, 4);
 	uint32_t io_conf = read_uint32(sl->q_buf, 0);
-	DD(sl, "GPIOC_CRH = 0x%08x", io_conf);
+	DLOG("GPIOC_CRH = 0x%08x\n", io_conf);
 
 	// set: general purpose output push-pull, output mode, max speed 10 MHz.
 	write_uint32(sl->q_buf, 0x44444411);
 	stlink_write_mem32(sl, GPIOC_CRH, 4);
 
-	clear_buf(sl);
+	memset(sl->q_buf, 0, sizeof(sl->q_buf));
 	for (int i = 0; i < 100; i++) {
 		write_uint32(sl->q_buf, LED_BLUE | LED_GREEN);
 		stlink_write_mem32(sl, GPIOC_ODR, 4);
 		/* stlink_read_mem32(sl, 0x4001100c, 4); */
 		/* DD(sl, "GPIOC_ODR = 0x%08x", read_uint32(sl->q_buf, 0)); */
-		delay(100);
+		usleep(100 * 1000);
 
-		clear_buf(sl);
+		memset(sl->q_buf, 0, sizeof(sl->q_buf));
 		stlink_write_mem32(sl, GPIOC_ODR, 4); // PC lo
-		delay(100);
+        usleep(100 * 1000);
 	}
 	write_uint32(sl->q_buf, io_conf); // set old state
 
@@ -126,7 +126,7 @@ int main(int argc, char *argv[]) {
 	stlink_read_mem32(sl, 0x08000c00, 256);
 	stlink_read_mem32(sl, 0x08000c00, 256);
 #endif
-#if 1
+#if 0
 	// sram 0x20000000 8kB
 	fputs("\n++++++++++ read/write 8bit, sram at 0x2000 0000 ++++++++++++++++\n\n", stderr);
     memset(sl->q_buf, 0, sizeof(sl->q_buf));
@@ -169,13 +169,14 @@ int main(int argc, char *argv[]) {
 	stlink_read_mem32(sl, 0x20000000, 1024 * 6);
 	stlink_read_mem32(sl, 0x20000000 + 1024 * 6, 1024 * 2);
 #endif
-#if 0
-	stlink_read_all_regs(sl);
+#if 1
+    reg regs;
+	stlink_read_all_regs(sl, &regs);
 	stlink_step(sl);
 	fputs("++++++++++ write r0 = 0x12345678\n", stderr);
 	stlink_write_reg(sl, 0x12345678, 0);
-	stlink_read_reg(sl, 0);
-	stlink_read_all_regs(sl);
+	stlink_read_reg(sl, 0, &regs);
+	stlink_read_all_regs(sl, &regs);
 #endif
 #if 0
 	stlink_run(sl);