From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Tue, 11 Nov 2008 12:06:22 +0000 (+0100)
Subject: Merge branch 'master' into can-usb1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/b8ebad64ba024cba4fa9984ade263dc50db97268?hp=-c

Merge branch 'master' into can-usb1
---

b8ebad64ba024cba4fa9984ade263dc50db97268
diff --combined lincan/src/Makefile.omk
index 72d2811,2d80d9a..29e0ba4
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@@ -1,8 -1,8 +1,8 @@@
  lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
  		pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io pikronisa eb8245 \
 -		kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican virtual template
 +		kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan virtual template
  
- lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 nsi_canpci sh7760
+ lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760
  
  default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=n CONFIG_OC_LINCANVME=n
  default_CONFIG += CONFIG_OC_LINCAN_PORTIO_ONLY=n CONFIG_OC_LINCAN_MEMIO_ONLY=n
@@@ -37,10 -37,6 +37,10 @@@ ifeq ($(CONFIG_OC_LINCAN_CARD_sh7760),y
  lincan_cards_SOURCES += sh7760.c
  endif
  
 +ifeq ($(CONFIG_OC_LINCAN_CARD_usbcan),y)
 +lincan_cards_SOURCES += kthread.c
 +endif
 +
  ifneq ($(filter hms30c7202_can ns_dev_can,$(lincan_cards_SELECTED)),)
  $(warning Not finished C_CAN support requested)
  lincan_cards_SOURCES += c_can.c c_can_irq.c
diff --combined lincan/src/boardlist.c
index 0c2696a,86f332e..d7cf342
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@@ -41,11 -41,11 +41,12 @@@ extern int pcan_dongle_register(struct 
  extern int eb8245_register(struct hwspecops_t *hwspecops);
  extern int adlink7841_register(struct hwspecops_t *hwspecops);
  extern int tscan1_register(struct hwspecops_t *hwspecops);
+ extern int tscan1mmio_register(struct hwspecops_t *hwspecops);
  extern int ts7kv_register(struct hwspecops_t *hwspecops);
  extern int ns_dev_register(struct hwspecops_t *hwspecops);
  extern int hms30c7202_register(struct hwspecops_t *hwspecops);
  extern int nsi_canpci_register(struct hwspecops_t *hwspecops);
 +extern int usbcan_register(struct hwspecops_t *hwspecops);
  extern int pcan_pci_register(struct hwspecops_t *hwspecops);
  extern int esdpci200_register(struct hwspecops_t *hwspecops);
  extern int sh7760_register(struct hwspecops_t *hwspecops);
@@@ -148,6 -148,9 +149,9 @@@ const struct boardtype_t can_boardtypes
      #endif
      #if defined(CONFIG_OC_LINCAN_CARD_tscan1)
  	{"tscan1", tscan1_register, 1},
+ 	{"tscan1mmio", tscan1mmio_register, 1},
+     #endif
+     #if defined(CONFIG_OC_LINCAN_CARD_ts7kv)
  	{"ts7kv",  ts7kv_register, 1},
      #endif
      #if defined(CONFIG_OC_LINCAN_CARD_ns_dev_can)
@@@ -164,9 -167,6 +168,9 @@@
      #endif
      #if defined(CONFIG_OC_LINCAN_CARD_pcan_pci)&&defined(CAN_ENABLE_PCI_SUPPORT)
  	{"pcan_pci", pcan_pci_register, 0},
 +    #endif
 +    #if defined(CONFIG_OC_LINCAN_CARD_usbcan)
 +	{"usbcan", usbcan_register, 0},
      #endif
  	{NULL}
  };