X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/342df29e2031e12a3e928420873cbebeb85d645a..799073b4fb7461253f6dddb667e4a71d51859246:/lincan/src/Makefile.omk

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index c09a15b..fd53820 100644
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,11 +1,12 @@
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
 		pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan pikronisa eb8245 \
-		kv_pcican msmcan oscar adlink7841 unican virtual template
+		kv_pcican msmcan oscar adlink7841 unican virtual template usbcan
 
-lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1
+lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 nsi_canpci
 
 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
+default_CONFIG += CONFIG_OC_LINCAN_DETAILED_ERRORS=y
 default_CONFIG += $(foreach n, $(lincan_cards_NAMES), CONFIG_OC_LINCAN_CARD_$(n)=y)
 default_CONFIG += $(foreach n, $(lincan_morecards_NAMES), CONFIG_OC_LINCAN_CARD_$(n)=n)
 
@@ -20,7 +21,7 @@ ifeq ($(CONFIG_OC_LINCAN),y)
 rtlinux_INCLUDES = -I $(srcdir)/../include -I .
 kernel_INCLUDES = -I $(srcdir)/../include -I .
 #kernel_INCLUDES += -DCAN_DEBUG
-kernel_INCLUDES += -DWITH_DEVFS_FS
+kernel_INCLUDES += -DWITH_DEVFS_FS -DKBUILD_MODNAME
 
 lincan_cards_SOURCES = $(lincan_cards_SELECTED:%=%.c)
 
@@ -32,9 +33,13 @@ ifeq ($(CONFIG_OC_LINCAN_CARD_ipci165),y)
 lincan_cards_SOURCES += ipci165_fw.c kthread.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 
+lincan_cards_SOURCES += c_can.c c_can_irq.c
 endif
 
 ifneq ($(CONFIG_OC_LINCANRTL),y)
@@ -51,10 +56,10 @@ lincan_rtl_SOURCES = open_rtl.c close_rtl.c read_rtl.c write_rtl.c ioctl_rtl.c \
 endif #CONFIG_OC_LINCANRTL
 
 lincan_SOURCES = can_queue.c can_quekern.c main.c modparms.c \
-		devcommon.c setup.c finish.c irq.c boardlist.c \
+		devcommon.c setup.c finish.c irq.c sysdep_lnx.c boardlist.c \
 		sja1000p.c sja1000.c i82527.c  \
 	       	open.c close.c read.c write.c ioctl.c select.c fasync.c \
 		proc.c ioctl_query.c ioctl_remote.c \
 		$(lincan_cards_SOURCES) $(lincan_rtl_SOURCES)
-		
+
 endif #CONFIG_OC_LINCAN