#include "./can/ul_usb1.h"
//#include "./can/setup.h"
+#include "./usb/usb_defs.h"
#include "./usb/usb_vend.h"
#define MASK_EP1RX 0x01
/***********************************************************************
* Note:
* Code is wittingly complex in order to ease future changes in hardware
- *Â configuration and to make it as much similar as the code of LinCAN
+ * configuration and to make it as much similar as the code of LinCAN
***********************************************************************/
LT_TIMER_DEC(lt_10msec)
typedef void (*FNC)(); //function ptr
/***********************************************************************
- * global variables
- ***********************************************************************/
+ * global variables
+ ***********************************************************************/
usb_device_t usb_device;
-usb_ep_t eps[2];
+usb_ep_t eps[NUM_ENDPOINTS];
unsigned char ep1_rx_buff[USB_MAX_PACKET];
unsigned char ep1_tx_buff[USB_MAX_PACKET];
uint8_t timer_str,timer_rx_off,timer_tx_off,timer_configured;
memset( &usb_device, 0, sizeof( usb_device));
usb_device.id = 1;
+ usb_device.devdes_table = &usb_devdes_table;
usb_device.init = usb_lpc_init;
usb_debug_set_level(DEBUG_LEVEL_NONE);
- usb_device.cntep = 3;
+ usb_device.cntep = NUM_ENDPOINTS;
usb_device.ep = eps;
eps[0].max_packet_size = USB_MAX_PACKET;
eps[0].udev = &usb_device;
eps[1].udev = &usb_device;
- usb_device.vendor_fnc=usbcan_vendor;
+ usb_device.vendor_fnc=usbcan_vendor;
usb_init(&usb_device);
usb_connect(&usb_device);
* Start
***********************************************************************/
- timer_rx_off=timer_tx_off=timer_str=timer_configured=0;
+ timer_rx_off=timer_tx_off=timer_str=timer_configured=0;
while (1) {
usb_check_events(&usb_device);
chip->chipspecops->irq_handler(0,chip);
if (usb_device.ep_events & MASK_EP1RX) { //EP1RX - data waiting to receive
- uint8_t val;
if (canque_get_inslot(qends, &qedge, &slot, 0)>=0){ //Free slot obtained
size=usb_udev_read_endpoint(&eps[0],ep1_rx_buff,16);
if (size==16){
/* if (size==2){
- if (((*data)&CAN_OP_MASK)==CAN_OP_READ){ // Get data from CAN device and return to caller
- can_read((*data) & 0x7F,&val);
+ uint8_t val;
+ if ((data[0]&CAN_OP_MASK)==CAN_OP_READ){ // Get data from CAN device and return to caller
+ val = can_read(data[0] & ~CAN_OP_MASK);
*(data+1)=val;
usb_udev_write_endpoint(&eps[1],(unsigned char *)data,size);
timer_rx_off=50; //rosviceni diody pri prijmu
CLR_OUT_PIN(LED_PORT,LED2_BIT);
usb_can_send=0;
}
- if (((*data)&CAN_OP_MASK)==CAN_OP_WRITE){ // Save data to CAN device
- can_write((*data)&(~CAN_OP_MASK),data+1);
+ if ((data[0]&CAN_OP_MASK)==CAN_OP_WRITE){ // Save data to CAN device
+ can_write(data[1], data[0] & ~CAN_OP_MASK);
timer_tx_off=50; //rozsviceni diod pri vysilani
CLR_OUT_PIN(LED_PORT,LED1_BIT);
}