embedded: reintroduce missing emulated bus initialization for UL_USB1 board.

[lincan.git] / embedded / app / usbcan / main.c

diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c
index ad7fe36db6caf5891c3f317f9a9c9d195e7097fa..14fbe288e98c5eb5bf7b1b3c841e744a49dcb951 100644 (file)
--- a/embedded/app/usbcan/main.c
+++ b/embedded/app/usbcan/main.c
@@ -62,14 +62,13 @@
 
 //#include "./can/ul_usb1.h"
 
 
 //#include "./can/ul_usb1.h"
 

-//#include "./can/setup.h"
+#include "./can/setup.h"

 
 #include "./usb/usb_defs.h"
 #include "./usb/usb_vend.h"
 
 
 #include "./usb/usb_defs.h"
 #include "./usb/usb_vend.h"
 

-// DEBUG CAN
-#include "can/lpc17xx_can.h"
-// DEBUG CAN - end
+extern int can_lmc1_register(struct hwspecops_t *hwspecops);
+extern int ul_usb1_register(struct hwspecops_t *hwspecops);

 
 #define MASK_EP1RX  0x01
 #define MASK_EP1TX  0x02
 
 #define MASK_EP1RX  0x01
 #define MASK_EP1TX  0x02


@@ -109,7 +108,6 @@ typedef void (*FNC)(); //function ptr
 /***********************************************************************
  * global variables
  ***********************************************************************/
 /***********************************************************************
  * global variables
  ***********************************************************************/

-volatile uint32_t cnt;

 
 usb_device_t usb_device;
 
 
 usb_device_t usb_device;
 


@@ -158,19 +156,6 @@ int sys_err(){
   }
 }
 
   }
 }
 

-/***********************************************************************
- * Microsecond delay routine
- ***********************************************************************/
-/*
-void udelay(long time)
-{
-  volatile long ticks=(time * CCLK) / 2000000;
-  do{
-    ticks--;
-  } while(ticks>0);
-}
-*/
-

 /***********************************************************************
  * Routine for visible LED blinking (on USB transmission)
  ***********************************************************************/
 /***********************************************************************
  * Routine for visible LED blinking (on USB transmission)
  ***********************************************************************/


@@ -209,8 +194,6 @@ int main(void)
        int chipnr,bd;
        int i,size,m=0;
 
        int chipnr,bd;
        int i,size,m=0;
 

-       cnt=0;
-

        CANMSG("Starting USBCAN module firmware...\n");
 
 //     volatile int i=0;
        CANMSG("Starting USBCAN module firmware...\n");
 
 //     volatile int i=0;


@@ -230,17 +213,11 @@ int main(void)
                sys_err();
        }
 
                sys_err();
        }
 

-// !!! DEBUG - transmitting and receiving CAN messages with usage of queue system from LinCAN - first version! 
-

 
 

-       //***********************************************************************
+       // ***********************************************************************

        // * CAN device initialization - device side (adapted from LinCAN setup.c)
        // ***********************************************************************
 
        // * CAN device initialization - device side (adapted from LinCAN setup.c)
        // ***********************************************************************
 

-       // DEBUG
-       //can_init(); // only for successful compiling (defined in can_lpcbusemu.c)
-
-

        DEBUGMSG("Initiating CAN device initialization\n");
        baudrate[0]=1000;
 
        DEBUGMSG("Initiating CAN device initialization\n");
        baudrate[0]=1000;
 


@@ -269,12 +246,12 @@ int main(void)
 
        
 
 
        
 

-       // DEBUG
-       //ul_usb1_register(candev->hwspecops);  // only for successful compiling (defined in ul_usb1.c)
-       // register for another board
+#ifdef CONFIG_OC_LINCAN_CARD_ul_usb1
+       ul_usb1_register(candev->hwspecops);
+#endif
+#ifdef CONFIG_OC_LINCAN_CARD_can_lmc1

        can_lmc1_register(candev->hwspecops);
        can_lmc1_register(candev->hwspecops);

-
-       
+#endif

 
        bd=baudrate[0];
        if (candev->hwspecops->init_hw_data(candev)){
 
        bd=baudrate[0];
        if (candev->hwspecops->init_hw_data(candev)){


@@ -307,13 +284,17 @@ int main(void)
        }
 
 
        }
 
 

-       if (candev->hwspecops->request_io(candev))
+       if (candev->hwspecops->request_io(candev)) {
+               CANMSG("Error to request IO\n");

                sys_err();
                sys_err();

+       }

        candev->flags|=CANDEV_IO_RESERVED;
 
 
        candev->flags|=CANDEV_IO_RESERVED;
 
 

-       if (candev->hwspecops->reset(candev))
+       if (candev->hwspecops->reset(candev)) {
+               CANMSG("Error to reset chip\n");

                sys_err();
                sys_err();

+       }

 
 
        for(chipnr=0; chipnr<candev->nr_all_chips; chipnr++) {
 
 
        for(chipnr=0; chipnr<candev->nr_all_chips; chipnr++) {


@@ -327,11 +308,12 @@ int main(void)
 
                chip->flags |= CHIP_ATTACHED;
 
 
                chip->flags |= CHIP_ATTACHED;
 

-// Interrupts from chip are served in main cycle
-//             if(can_chip_setup_irq(chip)<0) {
-//                     CANMSG("Error to setup chip IRQ\n");
-//                     sys_err();
-//             }
+               // used with lpc17xx:
+               if(can_chip_setup_irq(chip)<0) {
+                       CANMSG("Error to setup chip IRQ\n");
+                       sys_err();
+               }
+

        }
 
        if (candev->flags & CANDEV_PROGRAMMABLE_IRQ)
        }
 
        if (candev->flags & CANDEV_PROGRAMMABLE_IRQ)


@@ -434,13 +416,11 @@ int main(void)
                usb_check_events(&usb_device);
                usb_control_response(&usb_device);
 
                usb_check_events(&usb_device);
                usb_control_response(&usb_device);
 

-// DEBUG
-//             if (!(IO0PIN&P0_SJA1000_INT_PIN)) //INT PIN is inverted
-//                     chip->chipspecops->irq_handler(0,chip);
-
-//             if (CAN1SR & CAN_SR_RBS)
-//                     chip->chipspecops->irq_handler(0,chip);
-
+#ifdef CONFIG_OC_LINCAN_CARD_ul_usb1
+               /* polled IRQ mode for ul_usb1 board*/
+               if (!(IO0PIN&P0_SJA1000_INT_PIN)) /* INT PIN is inverted */
+                       chip->chipspecops->irq_handler(0,chip);
+#endif

 
                if (usb_device.ep_events & MASK_EP1RX) {  //EP1RX - data waiting to receive
                        
 
                if (usb_device.ep_events & MASK_EP1RX) {  //EP1RX - data waiting to receive
                        


@@ -475,7 +455,7 @@ int main(void)
                        
                                        slot->msg=canmsg;
                                        canque_put_inslot(qends, qedge, slot);
                        
                                        slot->msg=canmsg;
                                        canque_put_inslot(qends, qedge, slot);

-                                       //CAN_send(&canmsg);
+

                                }
                                else
                                        canque_abort_inslot(qends,qedge,slot);
                                }
                                else
                                        canque_abort_inslot(qends,qedge,slot);


@@ -534,8 +514,6 @@ int main(void)
                                }
                                usb_udev_write_endpoint(&eps[1],ep1_tx_buff,16);
 
                                }
                                usb_udev_write_endpoint(&eps[1],ep1_tx_buff,16);
 

-                               //printf("ID: %d\n", msgid);
-

                                canque_free_outslot(qends, qedge, slot);
                                timer_tx_off=50;                //rozsviceni diod pri vysilani
                                CLR_OUT_PIN(LED_PORT,LED1_BIT);
                                canque_free_outslot(qends, qedge, slot);
                                timer_tx_off=50;                //rozsviceni diod pri vysilani
                                CLR_OUT_PIN(LED_PORT,LED1_BIT);


@@ -543,6 +521,7 @@ int main(void)
 
                        }
                        
 
                        }
                        

+

                }
                
 
                }