#endif /*CONFIG_OC_LINCAN_DETAILED_ERRORS*/
-/* CAN message over usb */
-struct usbcan_canmsg_t{
- __u8 chip_id;
- __u16 flags;
- __u8 id[4];
- __u8 length;
- __u8 data[8];
-};
-
/* Structure to hold all of our device specific stuff */
struct usbcan_usb {
struct usb_device *udev; /* the usb device for this device */
unsigned char *ctl_in_buffer; /* the buffer to receive data */
size_t bulk_in_size; /* the size of the receive buffer */
size_t ctl_in_size; /* the size of the receive buffer */
- __u8 ctl_in_endpointAddr; /* the address of the bulk in endpoint */
- __u8 ctl_out_endpointAddr; /* the address of the bulk in endpoint */
- __u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
- __u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */
+ u8 ctl_in_endpointAddr; /* the address of the bulk in endpoint */
+ u8 ctl_out_endpointAddr; /* the address of the bulk in endpoint */
+ u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
+ u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */
int errors; /* the last request tanked */
int open_count; /* count the number of openers */
spinlock_t err_lock; /* lock for errors */
struct mutex io_mutex; /* synchronize I/O with disconnect */
struct urb *rcv;
-/* uchar8_t rcv_msg[16];
- uchar8_t tx_msg[16];*/
- __u8 rcv_msg[16];
- __u8 tx_msg[16];
+ u8 rcv_msg[16];
+ u8 tx_msg[16];
kthread_t rcvthread; /* usb receive kernel thread */
struct candevice_t *candev;
struct usbcan_usb *dev = (struct usbcan_usb*)candev->sysdevptr.anydev;
if (!dev){
- CANMSG("Cannot register usbcan while usb device is not present.\n");
- CANMSG("Usbcan registers automatically on device insertion.\n");
+ CANMSG("USBCAN_REQUEST_IO: Cannot register usbcan while usb device is not present.\n");
+ CANMSG("USBCAN_REQUEST_IO: Usbcan registers automatically on device insertion.\n");
return -ENODEV;
}
int retval;
struct usbcan_usb *dev=(struct usbcan_usb*)chip->hostdevice->sysdevptr.anydev;
- __u8 usbbuf[16];
+ u8 usbbuf[16];
*(uint32_t *)(usbbuf)=cpu_to_le32(mask);
*(uint32_t *)(usbbuf+4)=cpu_to_le32(code);
&usbbuf, 16,
10000);
- if (retval==16){
+ if (retval==1){
if(usbbuf[0]==1){
DEBUGMSG("Setting acceptance code to 0x%lx\n",(unsigned long)code);
DEBUGMSG("Setting acceptance mask to 0x%lx\n",(unsigned long)mask);
int retval;
struct usbcan_usb *dev=(struct usbcan_usb*)chip->hostdevice->sysdevptr.anydev;
- __u8 usbbuf[16];
+ u8 usbbuf[16];
*(int32_t *)(usbbuf)=cpu_to_le32(rate);
*(int32_t *)(usbbuf+4)=cpu_to_le32(sjw);
usbbuf, 16,
10000);
- if (retval==16){
+ if (retval==1){
if(usbbuf[0]==1)
return 0;
}
struct usbcan_usb *dev=(struct usbcan_usb*)chip->hostdevice->sysdevptr.anydev;
int i=0;
int len;
- __u8 *ptr;
+ u8 *ptr;
/* Wait until Transmit Buffer Status is released */
while ( usbcan_chip_queue_status(chip) &&
CANMSG("URB error %d\n",retval);
return -EIO;
}
- if (len!=sizeof(struct usbcan_canmsg_t)){
+ if (len!=16){
CANMSG("CAN message not sent\n");
return -EIO;
}
if ((dev->candev->chip[dev->rcv_msg[0]])&&
(dev->candev->chip[dev->rcv_msg[0]]->flags & CHIP_CONFIGURED)
){
- __u8 *ptr;
+ u8 *ptr;
obj=dev->candev->chip[dev->rcv_msg[0]]->msgobj[0];