On 02/27/2012 03:53 PM, Stephane Grosjean wrote: > This patch adds the core of the peak_usb driver which handles PEAK-System > Technik PCAN USB adapters. It defines the parts which are common to the > PCAN-USB adapters: can network interfaces management, network-to/from-usb > data path interface, timestamps management... > > Tested-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx> > Acked-by: Wolfgang Grandegger <wg@xxxxxxxxxxxxxx> > Signed-off-by: Stephane Grosjean <s.grosjean@xxxxxxxxxxxxxxx> > --- > v7 changelog (pcan_usb_core.c only): > - use of print_hex_dump() in dump_mem() function > - use of monotonic clock in packets timestamp > > drivers/net/can/usb/Kconfig | 6 + > drivers/net/can/usb/Makefile | 1 + > drivers/net/can/usb/peak_usb/Makefile | 2 + > drivers/net/can/usb/peak_usb/pcan_usb_core.c | 951 ++++++++++++++++++++++++++ > drivers/net/can/usb/peak_usb/pcan_usb_core.h | 146 ++++ > 5 files changed, 1106 insertions(+), 0 deletions(-) > create mode 100644 drivers/net/can/usb/peak_usb/Makefile > create mode 100644 drivers/net/can/usb/peak_usb/pcan_usb_core.c > create mode 100644 drivers/net/can/usb/peak_usb/pcan_usb_core.h > > diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig > index 0452549..0a68768 100644 > --- a/drivers/net/can/usb/Kconfig > +++ b/drivers/net/can/usb/Kconfig > @@ -13,4 +13,10 @@ config CAN_ESD_USB2 > This driver supports the CAN-USB/2 interface > from esd electronic system design gmbh (http://www.esd.eu). > > +config CAN_PEAK_USB > + tristate "PEAK PCAN-USB/USB Pro interfaces" > + ---help--- > + This driver supports the PCAN-USB and PCAN-USB Pro adapters > + from PEAK-System Technik (http://www.peak-system.com). > + > endmenu > diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile > index fce3cf1..da6d1d3 100644 > --- a/drivers/net/can/usb/Makefile > +++ b/drivers/net/can/usb/Makefile > @@ -4,5 +4,6 @@ > > obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o > obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o > +obj-$(CONFIG_CAN_PEAK_USB) += peak_usb/ > > ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG > diff --git a/drivers/net/can/usb/peak_usb/Makefile b/drivers/net/can/usb/peak_usb/Makefile > new file mode 100644 > index 0000000..1aefbc8 > --- /dev/null > +++ b/drivers/net/can/usb/peak_usb/Makefile > @@ -0,0 +1,2 @@ > +obj-$(CONFIG_CAN_PEAK_USB) += peak_usb.o > +peak_usb-y = pcan_usb_core.o pcan_usb.o pcan_usb_pro.o Same problem with bisecability here, please fix. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
