X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2ddc142b196858f6025508f31dd0ce693d0f5c02..7c28d4d63c2ccd9945d1b0bb11dd3caff4c382b3:/embedded/app/usbcan/main.c diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c index 54b505a..14fbe28 100644 --- a/embedded/app/usbcan/main.c +++ b/embedded/app/usbcan/main.c @@ -218,10 +218,6 @@ int main(void) // * CAN device initialization - device side (adapted from LinCAN setup.c) // *********************************************************************** -// useless with lpc17xx (defined in can_lpcbusemu.c) -// can_init(); - - DEBUGMSG("Initiating CAN device initialization\n"); baudrate[0]=1000; @@ -288,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(); + } candev->flags|=CANDEV_IO_RESERVED; - if (candev->hwspecops->reset(candev)) + if (candev->hwspecops->reset(candev)) { + CANMSG("Error to reset chip\n"); sys_err(); + } for(chipnr=0; chipnrnr_all_chips; chipnr++) { @@ -416,9 +416,11 @@ int main(void) usb_check_events(&usb_device); usb_control_response(&usb_device); -// useless with lpc17xx: -// if (!(IO0PIN&P0_SJA1000_INT_PIN)) //INT PIN is inverted -// 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