Update of pxmc_test to the new command processor

darcs-hash:20070307093103-f2ef6-702f4c0b75a94e020fdf60212041aa9ee5894571.gz

diff --git a/app/pxmc_test/Makefile.omk b/app/pxmc_test/Makefile.omk
index 2461e626c411c877c4bc7ef085da495e5cc24f64..bc22f605792abd489ffb5d1891142a82a0bf5c3f 100644 (file)
--- a/app/pxmc_test/Makefile.omk
+++ b/app/pxmc_test/Makefile.omk
@@ -10,9 +10,9 @@ ifeq ($(CONFIG_USB_BASE),y)
 usb_libs = usbbase usbmore usbpdi
 endif
 
-pxmc_test_LIBS = boot_fn arch_drivers sci_channels excptvec misc pxmc m $(usb_libs)
+pxmc_test_LIBS = boot_fn arch_drivers sci_channels excptvec cmdproc cmdprocio misc pxmc m $(usb_libs)
 pxmc_test_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
 
-link_VARIANTS = ram flash
+#link_VARIANTS = ram flash
 
-endif
\ No newline at end of file
+endif

diff --git a/app/pxmc_test/pxmc_test.c b/app/pxmc_test/pxmc_test.c
index b67f30dd2a97865ad8eaa0a5b22b8eb6bbc82575..0fb57c3cd1c6818eae7861bd18d23710afe71f7d 100644 (file)
--- a/app/pxmc_test/pxmc_test.c
+++ b/app/pxmc_test/pxmc_test.c
@@ -98,58 +98,23 @@ void  unhandled_exception(void)
 //command processor    
 
 
+cmd_des_t const **cmd_list;
+
 cmd_des_t const cmd_des_help={0, 0,"HELP","prints help for commands",
-                        cmd_do_help,{(char*)&cmd_rs232}};
+                        cmd_do_help,{(char*)&cmd_list}};
 
 extern cmd_des_t *cmd_stm_default[1];
 
-cmd_des_t const *cmd_rs232_default[]={
+cmd_des_t const *cmd_list_default[]={
   
   &cmd_des_help,
-  (cmd_des_t*)1,
-  (cmd_des_t*)cmd_stm_default,
+  CMD_DES_INCLUDE_SUBLIST(cmd_stm_default),
   NULL
 };
 
-cmd_des_t const **cmd_rs232=cmd_rs232_default;
-
+cmd_des_t const **cmd_list=cmd_list_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;
-}
-
 
 //end command processor 
 /**********************************************/
@@ -219,6 +184,8 @@ pxmc_state_list_t pxmc_main_list = {
 /*      MAIN      */
 /******************/
 
+cmd_io_t cmd_io_rs232_line;
+
 int main()
 {
 
@@ -236,7 +203,7 @@ int main()
  printf("ready\n");
  
  do{ 
-     cmd_rs232_processor_run();
+     cmd_processor_run(&cmd_io_rs232_line, cmd_list_default);
      
  }while(1);