#include "../include/setup.h"
#include "../include/usbcan.h"
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
+ #include <linux/freezer.h>
+#endif
+
static int usbcan_probe(struct usb_interface *interface, const struct usb_device_id *id);
static void usbcan_disconnect(struct usb_interface *interface);
// static int sja1000_report_error_limit_counter;
-static void sja1000_report_error(struct canchip_t *chip,
+static void usbcan_report_error(struct canchip_t *chip,
unsigned sr, unsigned ir, unsigned ecc)
{
/*TODO : Error reporting from device */
-/* if(sja1000_report_error_limit_counter>=100)
+#if 0
+ if(sja1000_report_error_limit_counter>=100)
return;
CANMSG("Error: status register: 0x%x irq_register: 0x%02x error: 0x%02x\n",
);
}
#endif /*CONFIG_OC_LINCAN_DETAILED_ERRORS*/
+#endif
}
10000);
if (retval==1){
- CANMSG("Chip_queue_status: %d\n",buf[0]);
+ DEBUGMSG("Chip_queue_status: %d\n",buf[0]);
if(buf[0]==1)
return 0;
if(buf[0]==0)
}
/**
- * usbcan_irq_write_handler: - part of ISR code responsible for transmit events
- * @chip: pointer to chip state structure
- * @obj: pointer to attached queue description
+ * usbcan_kthread_read_handler: - part of kthread code responsible for receive completed events
+ * @dev: pointer to usb device related structure
+ * @obj: pointer to attached message object description
*
- * The main purpose of this function is to read message from attached queues
- * and transfer message contents into CAN controller chip.
+ * The main purpose of this function is to read message from usb urb
+ * and transfer message contents to CAN queue ends.
* This subroutine is called by
- * usbcan_irq_write_handler() for transmit events.
+ * usbcan_kthread().
* File: src/usbcan.c
*/
-void usbcan_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
-{
- int cmd;
+void usbcan_kthread_read_handler(struct usbcan_usb *dev, struct msgobj_t *obj){
+ int i, j, len, retval;
+ DEBUGMSG("USBCAN RX handler\n");
+ for (i=0;i<USBCAN_TOT_RX_URBS;i++){
+ if (test_and_clear_bit(USBCAN_MESSAGE_DATA_OK,&dev->rx[i].flags)){
+ DEBUGMSG("USBCAN Thread has received a message\n");
+ if ((dev->chip)&&(dev->chip->flags & CHIP_CONFIGURED)){
+ u8 *ptr;
+ struct usbcan_message *mess=&dev->rx[i];
+
+ len=*(u8 *)(mess->msg+1);
+ if(len > CAN_MSG_LENGTH) len = CAN_MSG_LENGTH;
+ obj->rx_msg.length = len;
+
+ obj->rx_msg.flags=le16_to_cpu(*(u16 *)(mess->msg+2));
+ obj->rx_msg.id=le32_to_cpu((*(u32 *)(mess->msg+4)));
- if(obj->tx_slot){
- // Do local transmitted message distribution if enabled
- if (processlocal){
- // fill CAN message timestamp
- can_filltimestamp(&obj->tx_slot->msg.timestamp);
+ for(ptr=mess->msg+8,j=0; j < len; ptr++,j++) {
+ obj->rx_msg.data[j]=*ptr;
+ }
- obj->tx_slot->msg.flags |= MSG_LOCAL;
- canque_filter_msg2edges(obj->qends, &obj->tx_slot->msg);
+ // fill CAN message timestamp
+ can_filltimestamp(&obj->rx_msg.timestamp);
+ canque_filter_msg2edges(obj->qends, &obj->rx_msg);
+ }
+ else
+ CANMSG("Destination chip not found\n");
+ }
+ if (!test_bit(USBCAN_MESSAGE_URB_PENDING,&dev->rx[i].flags)){
+ DEBUGMSG("Renewing RX urb\n");
+ retval = usb_submit_urb (dev->rx[i].u, GFP_KERNEL);
+ if (retval<0){
+ CANMSG("%d. URB error %d\n", i, retval);
+ set_bit(USBCAN_ERROR,&dev->flags);
+ }
+ else
+ set_bit(USBCAN_MESSAGE_URB_PENDING,&dev->rx[i].flags);
}
- // Free transmitted slot
- canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
- obj->tx_slot=NULL;
}
+}
- can_msgobj_clear_fl(obj,TX_PENDING);
- cmd=canque_test_outslot(obj->qends, &obj->tx_qedge, &obj->tx_slot);
- if(cmd<0)
- return;
- can_msgobj_set_fl(obj,TX_PENDING);
+/**
+ * usbcan_kthread_write_handler: - part of kthread code responsible for transmit done events
+ * @dev: pointer to usb device related structure
+ * @obj: pointer to attached message object description
+ *
+ * The main purpose of this function is to free allocated resources on transmit done event
+ * This subroutine is called by
+ * usbcan_kthread().
+ * File: src/usbcan.c
+ */
+void usbcan_kthread_write_handler(struct usbcan_usb *dev, struct msgobj_t *obj){
+ int i;
+ DEBUGMSG("USBCAN TX handler\n");
+ for (i=0;i<USBCAN_TOT_TX_URBS;i++){
+ if (test_and_clear_bit(USBCAN_MESSAGE_DATA_OK,&dev->tx[i].flags)){
+ struct usbcan_message *mess=&dev->tx[i];
+ DEBUGMSG("USBCAN Message successfully sent\n");
+
+ if(mess->slot){
+ // Do local transmitted message distribution if enabled
+ if (processlocal){
+ // fill CAN message timestamp
+ can_filltimestamp(&mess->slot->msg.timestamp);
+
+ mess->slot->msg.flags |= MSG_LOCAL;
+ canque_filter_msg2edges(obj->qends, &mess->slot->msg);
+ }
+ // Free transmitted slot
+ canque_free_outslot(obj->qends, mess->qedge, mess->slot);
+ mess->slot=NULL;
+ }
+ can_msgobj_clear_fl(obj,TX_PENDING);
- if (chip->chipspecops->pre_write_config(chip, obj, &obj->tx_slot->msg)) {
- obj->ret = -1;
- canque_notify_inends(obj->tx_qedge, CANQUEUE_NOTIFY_ERRTX_PREP);
- canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
- obj->tx_slot=NULL;
- return;
+ set_bit(USBCAN_FREE_TX_URB,&dev->flags);
+ set_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
+
+ // Test if some new messages arrived
+ set_bit(USBCAN_TX_PENDING,&dev->flags);
+ }
}
- if (chip->chipspecops->send_msg(chip, obj, &obj->tx_slot->msg)) {
- obj->ret = -1;
- canque_notify_inends(obj->tx_qedge, CANQUEUE_NOTIFY_ERRTX_SEND);
- canque_free_outslot(obj->qends, obj->tx_qedge, obj->tx_slot);
- obj->tx_slot=NULL;
- return;
+}
+
+/**
+ * usbcan_kthread_write_request_handler: - part of kthread code responsible for sending transmit urbs
+ * @dev: pointer to usb device related structure
+ * @obj: pointer to attached message object description
+ *
+ * The main purpose of this function is to create a usb transmit safe object
+ * and send it via free transmit usb urb
+ * This subroutine is called by
+ * usbcan_kthread().
+ * File: src/usbcan.c
+ */
+void usbcan_kthread_write_request_handler(struct usbcan_usb *dev, struct msgobj_t *obj){
+ int i, j, cmd, len, retval;
+ for (i=0;i<USBCAN_TOT_TX_URBS;i++){
+ if (test_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags)){
+ struct usbcan_message *mess=&dev->tx[i];
+ u8 *ptr;
+ cmd=canque_test_outslot(obj->qends, &mess->qedge, &mess->slot);
+ if(cmd>=0){
+ DEBUGMSG("USBCAN Sending a message\n");
+
+ can_msgobj_set_fl(obj,TX_PENDING);
+ clear_bit(USBCAN_FREE_TX_URB,&dev->flags);
+ clear_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
+
+ *(u8 *)(mess->msg)=0;
+ len = mess->slot->msg.length;
+ if(len > CAN_MSG_LENGTH)
+ len = CAN_MSG_LENGTH;
+ *(u8 *)(mess->msg+1)=len & 0xFF;
+ *(u16 *)(mess->msg+2)=cpu_to_le16(mess->slot->msg.flags);
+ *(u32 *)(mess->msg+4)=cpu_to_le32(mess->slot->msg.id);
+
+ for(ptr=mess->msg+8,j=0; j < len; ptr++,j++) {
+ *ptr=mess->slot->msg.data[j] & 0xFF;
+ }
+ for(; j < 8; ptr++,j++) {
+ *ptr=0;
+ }
+
+ set_bit(USBCAN_MESSAGE_URB_PENDING,&mess->flags);
+ retval = usb_submit_urb (dev->tx[i].u, GFP_KERNEL);
+ if (retval){
+ CANMSG("%d. URB error %d\n",i,retval);
+ clear_bit(USBCAN_MESSAGE_URB_PENDING,&mess->flags);
+ set_bit(USBCAN_FREE_TX_URB,&dev->flags);
+ set_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
+ obj->ret = -1;
+ canque_notify_inends(mess->qedge, CANQUEUE_NOTIFY_ERRTX_SEND);
+ canque_free_outslot(obj->qends, mess->qedge, mess->slot);
+ mess->slot=NULL;
+ }
+ }
+ else{
+ set_bit(USBCAN_FREE_TX_URB,&dev->flags);
+ break;
+ }
+ }
}
}
{
struct usbcan_usb *dev=(struct usbcan_usb *)chip->chip_data;
- CANMSG("Trying to send message\n");
+ DEBUGMSG("Trying to send message\n");
can_preempt_disable();
can_msgobj_set_fl(obj,TX_PENDING);
}
+/** *********************************
+ * USB related functions
+ * ********************************* */
-/* --------------------------------------------------------------------------------------------------- */
static int usbcan_sleep_thread(struct usbcan_usb *dev)
{
int rc = 0;
switch (urb->status) {
case 0:
/* success */
- CANMSG("%s > Message OK\n", __FUNCTION__);
+ DEBUGMSG("%s > Message OK\n", __FUNCTION__);
set_bit(USBCAN_DATA_OK,&mess->dev->flags);
set_bit(USBCAN_MESSAGE_DATA_OK,&mess->flags);
if (test_bit(USBCAN_MESSAGE_TYPE_RX,&mess->flags)){
- CANMSG("%s > RX flag set\n", __FUNCTION__);
+ DEBUGMSG("%s > RX flag set\n", __FUNCTION__);
set_bit(USBCAN_DATA_RX,&mess->dev->flags);
}
if (test_bit(USBCAN_MESSAGE_TYPE_TX,&mess->flags))
- CANMSG("%s > TX flag set\n", __FUNCTION__);
+ DEBUGMSG("%s > TX flag set\n", __FUNCTION__);
set_bit(USBCAN_DATA_TX,&mess->dev->flags);
clear_bit(USBCAN_MESSAGE_URB_PENDING,&mess->flags);
if (test_bit(USBCAN_THREAD_RUNNING,&mess->dev->flags))
{ /* Normal work to do */
if (test_and_clear_bit(USBCAN_DATA_OK,&dev->flags)){
- int j, len;
- CANMSG("USBCAN Succesfull data transfer\n");
+ DEBUGMSG("USBCAN Succesfull data transfer\n");
+
if (test_and_clear_bit(USBCAN_DATA_RX,&dev->flags)){
- CANMSG("USBCAN RX handler\n");
- for (i=0;i<USBCAN_TOT_RX_URBS;i++){
- if (test_and_clear_bit(USBCAN_MESSAGE_DATA_OK,&dev->rx[i].flags)){
- CANMSG("USBCAN Thread has received a message\n");
- if ((dev->chip)&&(dev->chip->flags & CHIP_CONFIGURED)){
- u8 *ptr;
- struct usbcan_message *mess=&dev->rx[i];
-
- len=*(u8 *)(mess->msg+1);
- if(len > CAN_MSG_LENGTH) len = CAN_MSG_LENGTH;
- obj->rx_msg.length = len;
-
- obj->rx_msg.flags=le16_to_cpu(*(u16 *)(mess->msg+2));
- obj->rx_msg.id=le32_to_cpu((*(u32 *)(mess->msg+4)));
-
- for(ptr=mess->msg+8,j=0; j < len; ptr++,j++) {
- obj->rx_msg.data[j]=*ptr;
- }
-
- // fill CAN message timestamp
- can_filltimestamp(&obj->rx_msg.timestamp);
- canque_filter_msg2edges(obj->qends, &obj->rx_msg);
- }
- else
- CANMSG("Destination chip not found\n");
- }
- if (!test_bit(USBCAN_MESSAGE_URB_PENDING,&dev->rx[i].flags)){
- CANMSG("Renewing RX urb\n");
- retval = usb_submit_urb (dev->rx[i].u, GFP_KERNEL);
- if (retval<0){
- CANMSG("%d. URB error %d\n", i, retval);
- set_bit(USBCAN_ERROR,&dev->flags);
- }
- else
- set_bit(USBCAN_MESSAGE_URB_PENDING,&dev->rx[i].flags);
- }
- }
+ usbcan_kthread_read_handler(dev, obj);
}
if (test_and_clear_bit(USBCAN_DATA_TX,&dev->flags)){
- CANMSG("USBCAN TX handler\n");
- for (i=0;i<USBCAN_TOT_TX_URBS;i++){
- if (test_and_clear_bit(USBCAN_MESSAGE_DATA_OK,&dev->tx[i].flags)){
- struct usbcan_message *mess=&dev->tx[i];
- CANMSG("USBCAN Message successfully sent\n");
-
- if(mess->slot){
- // Do local transmitted message distribution if enabled
- if (processlocal){
- // fill CAN message timestamp
- can_filltimestamp(&mess->slot->msg.timestamp);
-
- mess->slot->msg.flags |= MSG_LOCAL;
- canque_filter_msg2edges(obj->qends, &mess->slot->msg);
- }
- // Free transmitted slot
- canque_free_outslot(obj->qends, mess->qedge, mess->slot);
- mess->slot=NULL;
- }
- can_msgobj_clear_fl(obj,TX_PENDING);
-
- set_bit(USBCAN_FREE_TX_URB,&dev->flags);
- set_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
-
- // Test if some new messages arrived
- set_bit(USBCAN_TX_PENDING,&dev->flags);
- }
- }
+ usbcan_kthread_write_handler(dev, obj);
}
}
if (test_and_clear_bit(USBCAN_TX_PENDING,&dev->flags)){
- int i, cmd,j,len;
- for (i=0;i<USBCAN_TOT_TX_URBS;i++){
- if (test_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags)){
- struct usbcan_message *mess=&dev->tx[i];
- u8 *ptr;
- cmd=canque_test_outslot(obj->qends, &mess->qedge, &mess->slot);
- if(cmd>=0){
- CANMSG("USBCAN Sending a message\n");
-
- can_msgobj_set_fl(obj,TX_PENDING);
- clear_bit(USBCAN_FREE_TX_URB,&dev->flags);
- clear_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
-
- *(u8 *)(mess->msg)=0;
- len = mess->slot->msg.length;
- if(len > CAN_MSG_LENGTH)
- len = CAN_MSG_LENGTH;
- *(u8 *)(mess->msg+1)=len & 0xFF;
- *(u16 *)(mess->msg+2)=cpu_to_le16(mess->slot->msg.flags);
- *(u32 *)(mess->msg+4)=cpu_to_le32(mess->slot->msg.id);
-
- for(ptr=mess->msg+8,j=0; j < len; ptr++,j++) {
- *ptr=mess->slot->msg.data[j] & 0xFF;
- }
- for(; j < 8; ptr++,j++) {
- *ptr=0;
- }
-
- set_bit(USBCAN_MESSAGE_URB_PENDING,&mess->flags);
- retval = usb_submit_urb (dev->tx[i].u, GFP_KERNEL);
- if (retval){
- CANMSG("%d. URB error %d\n",i,retval);
- clear_bit(USBCAN_MESSAGE_URB_PENDING,&mess->flags);
- set_bit(USBCAN_FREE_TX_URB,&dev->flags);
- set_bit(USBCAN_MESSAGE_FREE,&dev->tx[i].flags);
- obj->ret = -1;
- canque_notify_inends(mess->qedge, CANQUEUE_NOTIFY_ERRTX_SEND);
- canque_free_outslot(obj->qends, mess->qedge, mess->slot);
- mess->slot=NULL;
- }
- }
- else{
- set_bit(USBCAN_FREE_TX_URB,&dev->flags);
- break;
- }
- }
- }
+ usbcan_kthread_write_request_handler(dev, obj);
}
}
}
iface_desc = interface->cur_altsetting;
if (iface_desc->desc.bNumEndpoints % 2){
- err("Endpoint count must be even");
+ CANMSG("Endpoint count must be even");
goto noalloc;
}
usbdevs = (struct usbcan_devs *) can_checked_malloc(sizeof(struct usbcan_devs));
if (!usbdevs) {
- err("Out of memory");
+ CANMSG("Out of memory");
goto error;
}
memset(usbdevs, 0, sizeof(struct usbcan_devs));
usbdevs->devs = (struct usbcan_usb **) can_checked_malloc(usbcan_chip_count * sizeof(struct usbcan_usb *));
if (!usbdevs->devs) {
- err("Out of memory");
+ CANMSG("Out of memory");
goto error;
}
memset(usbdevs->devs, 0, usbcan_chip_count * sizeof(struct usbcan_usb *));
/* allocate memory for our device state and initialize it */
usbdevs->devs[j] = (struct usbcan_usb *) can_checked_malloc(sizeof(struct usbcan_usb));
if (!usbdevs->devs[j]) {
- err("Out of memory");
+ CANMSG("Out of memory");
goto error;
}
memset(usbdevs->devs[j], 0, sizeof(struct usbcan_usb));
dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
dev->bulk_in_buffer = can_checked_malloc(buffer_size);
if (!dev->bulk_in_buffer) {
- err("Could not allocate bulk_in_buffer");
+ CANMSG("Could not allocate bulk_in_buffer");
goto error;
}
}
}
if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) {
- err("Could not find all bulk-in and bulk-out endpoints for chip %d",j);
+ CANMSG("Could not find all bulk-in and bulk-out endpoints for chip %d",j);
goto error;
}
}