Structured comments updated.

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

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index f85dcb6f1f9aa2750069db47657fc36af2551700..0f87484f3354bd7e8a6e39f105224086db1fee40 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -10,26 +10,17 @@
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 
-#include "supported_cards.h"
-
-#include "../include/pip.h"
-#include "../include/pccan.h"
-#include "../include/smartcan.h"
-#include "../include/pc-i03.h"
-#include "../include/pcm3680.h"
-#include "../include/m437.h"
-#include "../include/template.h"
-#include "../include/i82527.h"
-#include "../include/aim104.h"
-#include "../include/pcccan.h"
+#include "lincan_config.h"
 
 extern int template_register(struct hwspecops_t *hwspecops);
 extern int pip5_register(struct hwspecops_t *hwspecops);
 extern int pip6_register(struct hwspecops_t *hwspecops);
+extern int m437_register(struct hwspecops_t *hwspecops);
 extern int smartcan_register(struct hwspecops_t *hwspecops);
 extern int pccanf_register(struct hwspecops_t *hwspecops);
 extern int pccand_register(struct hwspecops_t *hwspecops);
 extern int pccanq_register(struct hwspecops_t *hwspecops);
+extern int kv_pcican_register(struct hwspecops_t *hwspecops);
 extern int nsi_register(struct hwspecops_t *hwspecops);
 extern int cc104_register(struct hwspecops_t *hwspecops);
 extern int pci03_register(struct hwspecops_t *hwspecops);
@@ -39,57 +30,66 @@ 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 msmcan_register(struct hwspecops_t *hwspecops);
 extern int virtual_register(struct hwspecops_t *hwspecops);
 
 const struct boardtype_t can_boardtypes[]={
-    #ifdef ENABLE_CARD_template
+    #ifdef CONFIG_OC_LINCAN_CARD_template
        {"template", template_register, 1},
     #endif
-    #ifdef ENABLE_CARD_template
+    #ifdef CONFIG_OC_LINCAN_CARD_template
        {"virtual", virtual_register, 0},
     #endif
-    #ifdef ENABLE_CARD_pip
+    #ifdef CONFIG_OC_LINCAN_CARD_pip
        {"pip5", pip5_register, 1},
        {"pip6", pip6_register, 1},
     #endif
-    #ifdef ENABLE_CARD_smartcan
+    #ifdef CONFIG_OC_LINCAN_CARD_smartcan
        {"smartcan", smartcan_register, 1},
     #endif
-    #ifdef ENABLE_CARD_nsi
+    #ifdef CONFIG_OC_LINCAN_CARD_nsi
        {"nsican", nsi_register, 1},
     #endif
-    #ifdef ENABLE_CARD_cc_can104
+    #ifdef CONFIG_OC_LINCAN_CARD_cc_can104
        {"cc104", cc104_register, 1},
     #endif
-    #ifdef ENABLE_CARD_aim104
+    #ifdef CONFIG_OC_LINCAN_CARD_aim104
        {"aim104", aim104_register, 1},
     #endif
-    #ifdef ENABLE_CARD_pc_i03
+    #ifdef CONFIG_OC_LINCAN_CARD_pc_i03
        {"pc-i03", pci03_register, 1},
     #endif
-    #ifdef ENABLE_CARD_pcm3680
+    #ifdef CONFIG_OC_LINCAN_CARD_pcm3680
        {"pcm3680", pcm3680_register, 2},
     #endif
-    #ifdef ENABLE_CARD_pccan
+    #ifdef CONFIG_OC_LINCAN_CARD_pccan
        {"pccan-f", pccanf_register, 1},
        {"pccan-s", pccanf_register, 1},
        {"pccan-d", pccand_register, 2},
        {"pccan-q", pccanq_register, 4},
     #endif
-    #ifdef ENABLE_CARD_m437
+    #if defined(CONFIG_OC_LINCAN_CARD_kv_pcican)&&defined(CAN_ENABLE_PCI_SUPPORT)
+       {"pcican-s", kv_pcican_register, 0},
+       {"pcican-d", kv_pcican_register, 0},
+       {"pcican-q", kv_pcican_register, 0},
+    #endif
+    #ifdef CONFIG_OC_LINCAN_CARD_m437
        {"m437", m437_register, 1},
     #endif
-    #ifdef ENABLE_CARD_pcccan
+    #ifdef CONFIG_OC_LINCAN_CARD_pcccan
        {"pcccan", pcccan_register, 1},
     #endif
-    #ifdef ENABLE_CARD_ssv
+    #ifdef CONFIG_OC_LINCAN_CARD_ssv
        {"ssv", ssv_register, 2},
     #endif
-    #ifdef ENABLE_CARD_bfadcan
+    #ifdef CONFIG_OC_LINCAN_CARD_bfadcan
        {"bfadcan", bfadcan_register, 1},
     #endif
-    #ifdef ENABLE_CARD_pikronisa
+    #ifdef CONFIG_OC_LINCAN_CARD_pikronisa
        {"pikronisa", pikronisa_register, 1},
+    #endif
+    #ifdef CONFIG_OC_LINCAN_CARD_msmcan
+       {"msmcan", msmcan_register, 1},
     #endif
        {NULL}
 };