From 7bdd564b9d903146bbfc02fe38e586fc8e15f282 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 28 Jun 2011 06:54:35 +0000
Subject: Updated demos using the shell.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3094 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/ARM7-AT91SAM7X-FATFS-GCC/main.c | 58 ++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

(limited to 'demos/ARM7-AT91SAM7X-FATFS-GCC/main.c')

diff --git a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
index ec69be25c..be123a786 100644
--- a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c
@@ -25,6 +25,7 @@
 #include "hal.h"
 #include "test.h"
 #include "shell.h"
+#include "chprintf.h"
 #include "evtimer.h"
 #include "ff.h"
 
@@ -73,8 +74,7 @@ static bool_t mmc_is_protected(void) {
 /* Generic large buffer.*/
 uint8_t fbuff[1024];
 
-static FRESULT scan_files(char *path)
-{
+static FRESULT scan_files(BaseChannel *chp, char *path) {
   FRESULT res;
   FILINFO fno;
   DIR dir;
@@ -92,14 +92,15 @@ static FRESULT scan_files(char *path)
         continue;
       fn = fno.fname;
       if (fno.fattrib & AM_DIR) {
-        siprintf(&path[i], "/%s", fn);
-        res = scan_files(path);
+        path[i++] = '/';
+        strcpy(&path[i], fn);
+        res = scan_files(chp, path);
         if (res != FR_OK)
           break;
         path[i] = 0;
       }
       else {
-        iprintf("%s/%s\r\n", path, fn);
+        chprintf(chp, "%s/%s\r\n", path, fn);
       }
     }
   }
@@ -115,20 +116,16 @@ static FRESULT scan_files(char *path)
 
 static void cmd_mem(BaseChannel *chp, int argc, char *argv[]) {
   size_t n, size;
-  char buf[52];
 
   (void)argv;
   if (argc > 0) {
-    shellPrintLine(chp, "Usage: mem");
+    chprintf(chp, "Usage: mem\r\n");
     return;
   }
   n = chHeapStatus(NULL, &size);
-  siprintf(buf, "core free memory : %lu bytes", chCoreStatus());
-  shellPrintLine(chp, buf);
-  siprintf(buf, "heap fragments   : %lu", n);
-  shellPrintLine(chp, buf);
-  siprintf(buf, "heap free total  : %lu bytes", size);
-  shellPrintLine(chp, buf);
+  chprintf(chp, "core free memory : %u bytes\r\n", chCoreStatus());
+  chprintf(chp, "heap fragments   : %u\r\n", n);
+  chprintf(chp, "heap free total  : %u bytes\r\n", size);
 }
 
 static void cmd_threads(BaseChannel *chp, int argc, char *argv[]) {
@@ -149,21 +146,19 @@ static void cmd_threads(BaseChannel *chp, int argc, char *argv[]) {
     "FINAL"
   };
   Thread *tp;
-  char buf[60];
 
   (void)argv;
   if (argc > 0) {
-    shellPrintLine(chp, "Usage: threads");
+    chprintf(chp, "Usage: threads\r\n");
     return;
   }
-  shellPrintLine(chp, "    addr    stack prio refs     state time");
+  chprintf(chp, "    addr    stack prio refs     state time\r\n");
   tp = chRegFirstThread();
   do {
-    siprintf(buf, "%8lx %8lx %4u %4i %9s %u",
-             (uint32_t)tp, (uint32_t)tp->p_ctx.r13,
-             (unsigned int)tp->p_prio, tp->p_refs - 1,
-             states[tp->p_state], (unsigned int)tp->p_time);
-    shellPrintLine(chp, buf);
+    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",
+            (uint32_t)tp, (uint32_t)tp->p_ctx.r13,
+            (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
+            states[tp->p_state], (uint32_t)tp->p_time);
     tp = chRegNextThread(tp);
   } while (tp != NULL);
 }
@@ -173,13 +168,13 @@ static void cmd_test(BaseChannel *chp, int argc, char *argv[]) {
 
   (void)argv;
   if (argc > 0) {
-    shellPrintLine(chp, "Usage: test");
+    chprintf(chp, "Usage: test\r\n");
     return;
   }
   tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),
                            TestThread, chp);
   if (tp == NULL) {
-    shellPrintLine(chp, "out of memory");
+    chprintf(chp, "out of memory\r\n");
     return;
   }
   chThdWait(tp);
@@ -192,25 +187,24 @@ static void cmd_tree(BaseChannel *chp, int argc, char *argv[]) {
 
   (void)argv;
   if (argc > 0) {
-    shellPrintLine(chp, "Usage: tree");
+    chprintf(chp, "Usage: tree\r\n");
     return;
   }
   if (!fs_ready) {
-    shellPrintLine(chp, "File System not mounted");
+    chprintf(chp, "File System not mounted\r\n");
     return;
   }
   err = f_getfree("/", &clusters, &fsp);
   if (err != FR_OK) {
-    shellPrintLine(chp, "FS: f_getfree() failed");
+    chprintf(chp, "FS: f_getfree() failed\r\n");
     return;
   }
-  siprintf((void *)fbuff,
-           "FS: %lu free clusters, %lu sectors per cluster, %lu bytes free",
+  chprintf(chp,
+           "FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",
            clusters, (uint32_t)MMC_FS.csize,
            clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMC_SECTOR_SIZE);
-  shellPrintLine(chp, (void *)fbuff);
   fbuff[0] = 0;
-  scan_files((char *)fbuff);
+  scan_files(chp, (char *)fbuff);
 }
 
 static const ShellCommand commands[] = {
@@ -322,8 +316,8 @@ int main(void) {
    * Normal main() thread activity, in this demo it does nothing except
    * sleeping in a loop and listen for events.
    */
-  chEvtRegister(&MMCD1.mmc_inserted_event, &el0, 0);
-  chEvtRegister(&MMCD1.mmc_removed_event, &el1, 1);
+  chEvtRegister(&MMCD1.inserted_event, &el0, 0);
+  chEvtRegister(&MMCD1.removed_event, &el1, 1);
   while (TRUE) {
     if (!shelltp)
       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
-- 
cgit v1.2.3