USB test - update to the new command processor.

darcs-hash:20070327165635-f2ef6-cb4d3bb989ab5fdec967e06ef77e43521c53479f.gz

diff --git a/app/usb_test/Makefile.omk b/app/usb_test/Makefile.omk
index 889d83fd0d0e259f9542bd3078daeb44189eeb9e..26a7c3df43a436149287d54442cdda7ad939bd96 100644 (file)
--- a/app/usb_test/Makefile.omk
+++ b/app/usb_test/Makefile.omk
@@ -6,7 +6,7 @@ bin_PROGRAMS  = usb_test
 
 usb_test_SOURCES = usb_test.c usb_loader.c
 
-usb_test_LIBS = boot_fn arch_drivers sci_channels excptvec usbbase usbmore usbpdi misc
+usb_test_LIBS = boot_fn arch_drivers sci_channels excptvec usbbase usbmore usbpdi misc cmdproc cmdprocio
 usb_test_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
 
 link_VARIANTS = ram flash flashnoram

diff --git a/app/usb_test/usb_test.c b/app/usb_test/usb_test.c
index 6c6fb9af8739f652505a21d257ae12a5fb423ac4..5ee26196eda9181d163ed7077c5af5c2a730946c 100644 (file)
--- a/app/usb_test/usb_test.c
+++ b/app/usb_test/usb_test.c
@@ -61,6 +61,10 @@ void test_unhandled_isr(void)
   while(1);
 }
 
+extern cmd_io_t cmd_io_rs232_line;
+cmd_des_t const **cmd_rs232;
+
+
 int main()
 {
   int blink=3;  
@@ -105,7 +109,7 @@ int main()
     blink ^= 1;
     deb_led_out(blink);
     
-    cmd_rs232_processor_run();
+    cmd_processor_run(&cmd_io_rs232_line, cmd_rs232);
    #ifdef WITH_USB
     cmd_usb_processor_run();
     if(usb_ready2work) {
@@ -302,37 +306,6 @@ cmd_des_t const **cmd_rs232=cmd_rs232_default;
 
 cmd_des_t const **cmd_usb=cmd_rs232_default;
 
-int cmd_rs232_processor_run(void)
-{
-  int val;
-  cmd_io_t* cmd_io;
-   
-  cmd_io=&cmd_io_rs232;
-  if(cmd_rs232_line_out(cmd_io))
-    return 1;
-  if(cmd_rs232_line_in(cmd_io)<=0)
-    return 0;
-
-  if(cmd_rs232){
-    val=proc_cmd_line(cmd_io, cmd_rs232, cmd_io->priv.ed_line.in->buf);
-  }else{
-    val=-CMDERR_BADCMD;
-  }
-
-  if(cmd_io->priv.ed_line.out->inbuf){
-    cmd_io_putc(cmd_io,'\r');
-    cmd_io_putc(cmd_io,'\n');
-  }else if(val<0){
-    char s[20];
-    cmd_io_write(&cmd_io_rs232,"ERROR ",6);
-    i2str(s,-val,0,0);
-    cmd_io_write(cmd_io,s,strlen(s));
-    cmd_io_putc(cmd_io,'\r');
-    cmd_io_putc(cmd_io,'\n');
-  }
-  return 1;
-}
-
 #ifdef WITH_USB
 
 int cmd_usb_processor_run()