Fixed pxmc_test to be more universal.

darcs-hash:20071129000754-f2ef6-9b251eb5b120275cb333a8dbb5bb2478d4cdd519.gz

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

diff --git a/app/pxmc_test/pxmc_test.c b/app/pxmc_test/pxmc_test.c
index 6e5d86d10282ae890188b31c63c1e8bef1feeec1..586f39d3f47e2210b03db8f3a684fea8b7aa6e04 100644 (file)
--- a/app/pxmc_test/pxmc_test.c
+++ b/app/pxmc_test/pxmc_test.c
@@ -12,7 +12,7 @@
 #include <cmd_proc.h>
 #include <stdlib.h>
 #include <pxmc.h>
-#include <pxmc_h2638.h>
+#include <pxmcbsp.h>
 
     /* void exit(int status) */
     /* { */
@@ -171,14 +171,15 @@ pxmc_state_t mcsX1={
       PXMS_CFG_HPS_m|PXMS_CFG_HDIR_m|0x1
 };
 
-pxmc_state_t *pxmc_main_arr[] = {&mcsX0,&mcsX1};
+/* pxmc_state_t *pxmc_main_arr[] = {&mcsX0,&mcsX1}; */
 
-#define SUMMOTORS  (sizeof(pxmc_main_arr)/sizeof(pxmc_main_arr[0]))
+/* #define SUMMOTORS  (sizeof(pxmc_main_arr)/sizeof(pxmc_main_arr[0])) */
 
-pxmc_state_list_t pxmc_main_list = {
-  pxml_arr:pxmc_main_arr,
-  pxml_cnt:SUMMOTORS
-};
+/* pxmc_state_list_t pxmc_main_list = { */
+/*   pxml_arr:pxmc_main_arr, */
+/*   pxml_cnt:SUMMOTORS */
+/* }; */
+/* FIXME: Application should be able to ovverride pxmc_main_list in BSP. */
 
  
 /******************/
@@ -201,9 +202,10 @@ int main()
 /*  pxmc_initialize(); */
 /*  pxmc_axis_mode(pxmc_main_list.pxml_arr[0], 4); */
 
+ pxmc_initialize();
  /* Petr Kovacik's version needs the following initialization. FIXME */
- pxmc_set_pwm_tpu();
- pxmc_add_pservice_and_mode(4); /*Macro -  mod=4 tj. all motors are DC*/
+/*  pxmc_set_pwm_tpu(); */
+/*  pxmc_add_pservice_and_mode(4); /\*Macro -  mod=4 tj. all motors are DC*\/ */
 
  
  printf("ready\n");