Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / boardlist.c

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index 1b0ddeb42b12c70f6532c62a409d76aaa251e925..0c2696ac64fea3df7acfe564e80c4ab68894188d 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -30,6 +30,8 @@ extern int pcccan_register(struct hwspecops_t *hwspecops);
 extern int ssv_register(struct hwspecops_t *hwspecops);
 extern int bfadcan_register(struct hwspecops_t *hwspecops);
 extern int pikronisa_register(struct hwspecops_t *hwspecops);
+extern int gensja1000io_register(struct hwspecops_t *hwspecops);
+extern int pimx1_register(struct hwspecops_t *hwspecops);
 extern int msmcan_register(struct hwspecops_t *hwspecops);
 extern int unican_register(struct hwspecops_t *hwspecops);
 extern int unican_pci_register(struct hwspecops_t *hwspecops);
@@ -38,14 +40,21 @@ extern int ipci165_register(struct hwspecops_t *hwspecops);
 extern int pcan_dongle_register(struct hwspecops_t *hwspecops);
 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 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);
 
 const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_template
        {"template", template_register, 1},
     #endif
-    #ifdef CONFIG_OC_LINCAN_CARD_template
+    #ifdef CONFIG_OC_LINCAN_CARD_virtual
        {"virtual", virtual_register, 0},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_oscar
@@ -104,6 +113,12 @@ const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_pikronisa
        {"pikronisa", pikronisa_register, 1},
     #endif
+    #ifdef CONFIG_OC_LINCAN_CARD_gensja1000io
+       {"gensja1000io", gensja1000io_register, 1},
+    #endif
+    #ifdef CONFIG_OC_LINCAN_CARD_pimx1
+       {"pimx1", pimx1_register, 0},
+    #endif
     #ifdef CONFIG_OC_LINCAN_CARD_msmcan
        {"msmcan", msmcan_register, 1},
     #endif
@@ -128,11 +143,30 @@ const struct boardtype_t can_boardtypes[]={
     #if defined(CONFIG_OC_LINCAN_CARD_adlink7841)
        {"adlink7841", adlink7841_register, 0},
     #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_esdpci200)
+       {"esdpci200", esdpci200_register, 0},
+    #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_tscan1)
+       {"tscan1", tscan1_register, 1},
+       {"ts7kv",  ts7kv_register, 1},
+    #endif
     #if defined(CONFIG_OC_LINCAN_CARD_ns_dev_can)
        {"ns_dev", ns_dev_register, 1},
     #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_sh7760)
+       {"sh7760", sh7760_register, 2},
+    #endif
     #if defined(CONFIG_OC_LINCAN_CARD_hms30c7202_can)
        {"hms30c7202", hms30c7202_register, 1},
+    #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_nsi_canpci)&&defined(CAN_ENABLE_PCI_SUPPORT)
+       {"nsicanpci", nsi_canpci_register, 1},
+    #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}
 };