Corrected conditional for "virtual" board inclusion in the board list.

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

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index 739f30ed6ac97a0dd03ad2118566dc18c810c31f..0f0d5ccb1998e909abda48b5653bc0056c4bba5e 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -30,13 +30,17 @@ 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 ssv_register(struct hwspecops_t *hwspecops);
 extern int bfadcan_register(struct hwspecops_t *hwspecops);
 extern int pikronisa_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);
 extern int unican_vme_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);
 extern int unican_vme_register(struct hwspecops_t *hwspecops);

+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 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 ns_dev_register(struct hwspecops_t *hwspecops);
 extern int hms30c7202_register(struct hwspecops_t *hwspecops);
 


@@ -44,7 +48,7 @@ const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_template
        {"template", template_register, 1},
     #endif
     #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
        {"virtual", virtual_register, 0},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_oscar


@@ -103,12 +107,18 @@ const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_pikronisa
        {"pikronisa", pikronisa_register, 1},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_pikronisa
        {"pikronisa", pikronisa_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
     #ifdef CONFIG_OC_LINCAN_CARD_unican
        {"unican", unican_register, 1},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_msmcan
        {"msmcan", msmcan_register, 1},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_unican
        {"unican", unican_register, 1},
     #endif

+    #ifdef CONFIG_OC_LINCAN_CARD_ipci165
+       {"ipci165", ipci165_register, 0},
+    #endif

     #if defined(CONFIG_OC_LINCAN_CARD_unican)&&defined(CAN_ENABLE_PCI_SUPPORT)
        {"unican-pci", unican_pci_register, 0},
     #endif
     #if defined(CONFIG_OC_LINCAN_CARD_unican)&&defined(CAN_ENABLE_PCI_SUPPORT)
        {"unican-pci", unican_pci_register, 0},
     #endif


@@ -124,6 +134,10 @@ const struct boardtype_t can_boardtypes[]={
     #if defined(CONFIG_OC_LINCAN_CARD_adlink7841)
        {"adlink7841", adlink7841_register, 0},
     #endif
     #if defined(CONFIG_OC_LINCAN_CARD_adlink7841)
        {"adlink7841", adlink7841_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_ns_dev_can)
        {"ns_dev", ns_dev_register, 1},
     #endif