From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Stephane Grosjean <s.grosjean@peak-system.com>,
linux-can@vger.kernel.org
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Subject: Re: [PATCH v5] can/peak_usb: add support for PEAK new CANFD USB adapters
Date: Tue, 20 Jan 2015 15:21:11 +0100 [thread overview]
Message-ID: <54BE6457.1020003@pengutronix.de> (raw)
In-Reply-To: <1421757005-17271-1-git-send-email-s.grosjean@peak-system.com>
[-- Attachment #1: Type: text/plain, Size: 4746 bytes --]
On 01/20/2015 01:30 PM, Stephane Grosjean wrote:
> Add support for the following new PEAK-System technik CANFD USB adapters:
>
> PCAN-USB FD single CANFD channel USB adapter
> PCAN-USB Pro FD dual CANFD channels USB adapter
>
> Communication protocol has been developped using some mechanisms that
> did exist in the PCAN-USB Pro, thus, this patch also changes some
> previously static functions and data into global ones.
>
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
> ---
> drivers/net/can/usb/Kconfig | 14 +-
> drivers/net/can/usb/peak_usb/Makefile | 2 +-
> drivers/net/can/usb/peak_usb/pcan_ucan.h | 222 ++++++
> drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +
> drivers/net/can/usb/peak_usb/pcan_usb_core.h | 4 +
> drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 1091 ++++++++++++++++++++++++++
> drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 16 +-
> drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 13 +
> 8 files changed, 1350 insertions(+), 16 deletions(-)
> create mode 100644 drivers/net/can/usb/peak_usb/pcan_ucan.h
> create mode 100644 drivers/net/can/usb/peak_usb/pcan_usb_fd.c
[...]
> +};
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> index a2fc94a..a764045 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
> @@ -27,14 +27,6 @@
>
> MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro adapter");
>
> -/* PCAN-USB Pro Endpoints */
> -#define PCAN_USBPRO_EP_CMDOUT 1
> -#define PCAN_USBPRO_EP_CMDIN (PCAN_USBPRO_EP_CMDOUT | USB_DIR_IN)
> -#define PCAN_USBPRO_EP_MSGOUT_0 2
> -#define PCAN_USBPRO_EP_MSGIN (PCAN_USBPRO_EP_MSGOUT_0 | USB_DIR_IN)
> -#define PCAN_USBPRO_EP_MSGOUT_1 3
> -#define PCAN_USBPRO_EP_UNUSED (PCAN_USBPRO_EP_MSGOUT_1 | USB_DIR_IN)
> -
> #define PCAN_USBPRO_CHANNEL_COUNT 2
>
> /* PCAN-USB Pro adapter internal clock (MHz) */
> @@ -322,8 +314,8 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev,
> return (i >= PCAN_USBPRO_RSP_SUBMIT_MAX) ? -ERANGE : err;
> }
>
> -static int pcan_usb_pro_send_req(struct peak_usb_device *dev, int req_id,
> - int req_value, void *req_addr, int req_size)
> +int pcan_usb_pro_send_req(struct peak_usb_device *dev, int req_id,
> + int req_value, void *req_addr, int req_size)
> {
> int err;
> u8 req_type;
> @@ -475,7 +467,7 @@ static int pcan_usb_pro_set_bittiming(struct peak_usb_device *dev,
> return pcan_usb_pro_set_bitrate(dev, ccbt);
> }
>
> -static void pcan_usb_pro_restart_complete(struct urb *urb)
> +void pcan_usb_pro_restart_complete(struct urb *urb)
> {
> /* can delete usb resources */
> peak_usb_async_complete(urb);
> @@ -977,7 +969,7 @@ static void pcan_usb_pro_free(struct peak_usb_device *dev)
> /*
> * probe function for new PCAN-USB Pro usb interface
> */
> -static int pcan_usb_pro_probe(struct usb_interface *intf)
> +int pcan_usb_pro_probe(struct usb_interface *intf)
> {
> struct usb_host_interface *if_desc;
> int i;
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.h b/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
> index 837cee2..a62f7ab 100644
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
> @@ -27,6 +27,14 @@
> #define PCAN_USBPRO_INFO_BL 0
> #define PCAN_USBPRO_INFO_FW 1
>
> +/* PCAN-USB Pro (FD) Endpoints */
> +#define PCAN_USBPRO_EP_CMDOUT 1
> +#define PCAN_USBPRO_EP_CMDIN (PCAN_USBPRO_EP_CMDOUT | USB_DIR_IN)
> +#define PCAN_USBPRO_EP_MSGOUT_0 2
> +#define PCAN_USBPRO_EP_MSGIN (PCAN_USBPRO_EP_MSGOUT_0 | USB_DIR_IN)
> +#define PCAN_USBPRO_EP_MSGOUT_1 3
> +#define PCAN_USBPRO_EP_UNUSED (PCAN_USBPRO_EP_MSGOUT_1 | USB_DIR_IN)
> +
> /* Vendor Request value for XXX_FCT */
> #define PCAN_USBPRO_FCT_DRVLD 5 /* tell device driver is loaded */
> #define PCAN_USBPRO_FCT_DRVLD_REQ_LEN 16
> @@ -176,4 +184,9 @@ union pcan_usb_pro_rec {
> struct pcan_usb_pro_txmsg tx_msg;
> };
>
> +int pcan_usb_pro_probe(struct usb_interface *intf);
> +int pcan_usb_pro_send_req(struct peak_usb_device *dev, int req_id,
> + int req_value, void *req_addr, int req_size);
> +void pcan_usb_pro_restart_complete(struct urb *urb);
> +
> #endif
>
I've moved the above hunks into a separate patch.
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-01-20 14:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 12:30 [PATCH v5] can/peak_usb: add support for PEAK new CANFD USB adapters Stephane Grosjean
2015-01-20 13:08 ` Andri Yngvason
2015-01-20 14:21 ` Marc Kleine-Budde [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54BE6457.1020003@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=s.grosjean@peak-system.com \
--cc=socketcan@hartkopp.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).