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

Commit d8a19935 authored by Stephane Grosjean's avatar Stephane Grosjean Committed by Marc Kleine-Budde
Browse files

can: usb: PEAK-System Technik PCAN-USB Pro specific part 

This patch adds the specific part which handles the PCAN-USB Pro adapter
from PEAK-System Technik (http://www.peak-system.com

). The PCAN-USB Pro
adapter is a dual-channel USB 2.0 adapter compliant with CAN specifications

Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Acked-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarStephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 46be265d

drivers/net/can/usb/peak_usb/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CAN_PEAK_USB) += peak_usb.o

peak_usb-y = pcan_usb_core.o pcan_usb.o
 
peak_usb-y = pcan_usb_core.o pcan_usb.o pcan_usb_pro.o

drivers/net/can/usb/peak_usb/pcan_usb_pro.c

0 → 100644
+1036 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/can/usb/peak_usb/pcan_usb_pro.h

0 → 100644
+178 −0
Original line number Diff line number Diff line 
/*

 * CAN driver for PEAK System PCAN-USB Pro adapter

 * Derived from the PCAN project file driver/src/pcan_usbpro_fw.h

 *

 * Copyright (C) 2003-2011 PEAK System-Technik GmbH

 * Copyright (C) 2011-2012 Stephane Grosjean <s.grosjean@peak-system.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published

 * by the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */

#ifndef PCAN_USB_PRO_H

#define PCAN_USB_PRO_H



/*

 * USB Vendor request data types

 */

#define PCAN_USBPRO_REQ_INFO		0

#define PCAN_USBPRO_REQ_FCT		2



/* Vendor Request value for XXX_INFO */

#define PCAN_USBPRO_INFO_BL		0

#define PCAN_USBPRO_INFO_FW		1



/* Vendor Request value for XXX_FCT */

#define PCAN_USBPRO_FCT_DRVLD		5 /* tell device driver is loaded */



/* PCAN_USBPRO_INFO_BL vendor request record type */

struct __packed pcan_usb_pro_blinfo {

	u32 ctrl_type;

	u8  version[4];

	u8  day;

	u8  month;

	u8  year;

	u8  dummy;

	u32 serial_num_hi;

	u32 serial_num_lo;

	u32 hw_type;

	u32 hw_rev;

};



/* PCAN_USBPRO_INFO_FW vendor request record type */

struct __packed pcan_usb_pro_fwinfo {

	u32 ctrl_type;

	u8  version[4];

	u8  day;

	u8  month;

	u8  year;

	u8  dummy;

	u32 fw_type;

};



/*

 * USB Command record types

 */

#define PCAN_USBPRO_SETBTR	0x02

#define PCAN_USBPRO_SETBUSACT	0x04

#define PCAN_USBPRO_SETSILENT	0x05

#define PCAN_USBPRO_SETFILTR	0x0a

#define PCAN_USBPRO_SETTS	0x10

#define PCAN_USBPRO_GETDEVID	0x12

#define PCAN_USBPRO_SETLED	0x1C

#define PCAN_USBPRO_RXMSG8	0x80

#define PCAN_USBPRO_RXMSG4	0x81

#define PCAN_USBPRO_RXMSG0	0x82

#define PCAN_USBPRO_RXRTR	0x83

#define PCAN_USBPRO_RXSTATUS	0x84

#define PCAN_USBPRO_RXTS	0x85

#define PCAN_USBPRO_TXMSG8	0x41

#define PCAN_USBPRO_TXMSG4	0x42

#define PCAN_USBPRO_TXMSG0	0x43



/* record structures */

struct __packed pcan_usb_pro_btr {

	u8  data_type;

	u8  channel;

	u16 dummy;

	u32 CCBT;

};



struct __packed pcan_usb_pro_busact {

	u8  data_type;

	u8  channel;

	u16 onoff;

};



struct __packed pcan_usb_pro_silent {

	u8  data_type;

	u8  channel;

	u16 onoff;

};



struct __packed pcan_usb_pro_filter {

	u8  data_type;

	u8  dummy;

	u16 filter_mode;

};



struct __packed pcan_usb_pro_setts {

	u8  data_type;

	u8  dummy;

	u16 mode;

};



struct __packed pcan_usb_pro_devid {

	u8  data_type;

	u8  channel;

	u16 dummy;

	u32 serial_num;

};



struct __packed pcan_usb_pro_setled {

	u8  data_type;

	u8  channel;

	u16 mode;

	u32 timeout;

};



struct __packed pcan_usb_pro_rxmsg {

	u8  data_type;

	u8  client;

	u8  flags;

	u8  len;

	u32 ts32;

	u32 id;



	u8  data[8];

};



#define PCAN_USBPRO_STATUS_ERROR	0x0001

#define PCAN_USBPRO_STATUS_BUS		0x0002

#define PCAN_USBPRO_STATUS_OVERRUN	0x0004

#define PCAN_USBPRO_STATUS_QOVERRUN	0x0008



struct __packed pcan_usb_pro_rxstatus {

	u8  data_type;

	u8  channel;

	u16 status;

	u32 ts32;

	u32 err_frm;

};



struct __packed pcan_usb_pro_rxts {

	u8  data_type;

	u8  dummy[3];

	u32 ts64[2];

};



struct __packed pcan_usb_pro_txmsg {

	u8  data_type;

	u8  client;

	u8  flags;

	u8  len;

	u32 id;

	u8  data[8];

};



union pcan_usb_pro_rec {

	u8				data_type;

	struct pcan_usb_pro_btr		btr;

	struct pcan_usb_pro_busact	bus_act;

	struct pcan_usb_pro_silent	silent_mode;

	struct pcan_usb_pro_filter	filter_mode;

	struct pcan_usb_pro_setts	ts;

	struct pcan_usb_pro_devid	dev_id;

	struct pcan_usb_pro_setled	set_led;

	struct pcan_usb_pro_rxmsg	rx_msg;

	struct pcan_usb_pro_rxstatus	rx_status;

	struct pcan_usb_pro_rxts	rx_ts;

	struct pcan_usb_pro_txmsg	tx_msg;

};



#endif