Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 702171ad authored Sep 16, 2009 by Sebastian Haas Committed by David S. Miller Sep 21, 2009

ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface

This patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from
EMS Dr. Thomas Wuensche (http://www.ems-wuensche.com

).

Signed-off-by: Sebastian Haas <haas@ems-wuensche.com>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c1e815c0

drivers/net/can/Kconfig

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,13 @@ config CAN_EMS_PCI
	CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche		CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
	(http://www.ems-wuensche.de).		(http://www.ems-wuensche.de).

			config CAN_EMS_USB
			tristate "EMS CPC-USB/ARM7 CAN/USB interface"
			depends on USB && CAN_DEV
			---help---
			This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
			from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).

	config CAN_KVASER_PCI		config CAN_KVASER_PCI
	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"		tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
	depends on PCI && CAN_SJA1000		depends on PCI && CAN_SJA1000

drivers/net/can/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,8 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o
	obj-$(CONFIG_CAN_DEV) += can-dev.o		obj-$(CONFIG_CAN_DEV) += can-dev.o
	can-dev-y := dev.o		can-dev-y := dev.o

			obj-y += usb/

	obj-$(CONFIG_CAN_SJA1000) += sja1000/		obj-$(CONFIG_CAN_SJA1000) += sja1000/

	ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG		ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG

drivers/net/can/usb/Makefile

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			#
			# Makefile for the Linux Controller Area Network USB drivers.
			#

			obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o

drivers/net/can/usb/ems_usb.c

0 → 100644

+1155 −0

File added.

Preview size limit exceeded, changes collapsed.