UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: serial: metro-usb: remove the .h file 

A driver doesn't need a .h file just for simple things like vendor ids
and a private structure.  So move it into the .c file instead, saving
some overall lines.

Cc: Aleksey Babahin <tamerlan311@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-03-08 13:42:41 -08:00
parent 1935e357bb
commit 159d4d8d5e
2 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/serial/metro-usb.c
View File

@ -40,15 +40,34 @@
#include <linux/tty_flip.h>
#include <linux/moduleparam.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/errno.h>
#include "metro-usb.h"
#include <linux/usb/serial.h>
#include <asm/uaccess.h>
/* Version Information */
#define DRIVER_VERSION "v1.2.0.0"
#define DRIVER_DESC "Metrologic Instruments Inc. - USB-POS driver"
/* Product information. */
#define FOCUS_VENDOR_ID 0x0C2E
#define FOCUS_PRODUCT_ID 0x0720
#define FOCUS_PRODUCT_ID_UNI 0x0710
#define METROUSB_SET_REQUEST_TYPE 0x40
#define METROUSB_SET_MODEM_CTRL_REQUEST 10
#define METROUSB_SET_BREAK_REQUEST 0x40
#define METROUSB_MCR_NONE 0x08 /* Deactivate DTR and RTS. */
#define METROUSB_MCR_RTS 0x0a /* Activate RTS. */
#define METROUSB_MCR_DTR 0x09 /* Activate DTR. */
#define WDR_TIMEOUT 5000 /* default urb timeout. */
/* Private data structure. */
struct metrousb_private {
spinlock_t lock;
int throttled;
unsigned long control_state;
};
/* Device table list. */
static struct usb_device_id id_table [] = {
{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID) },

52
drivers/usb/serial/metro-usb.h
View File

@ -1,52 +0,0 @@
/*
Date Created: 1/12/2007
File Name: metro-usb.h
Description: metro-usb.h is the drivers header file. The driver is a USB to Serial converter.
The driver takes USB data and sends it to a virtual ttyUSB# serial port.
The driver interfaces with the usbserial.ko driver supplied by Linux.
NOTES:
To install the driver:
1. Install the usbserial.ko module supplied by Linux with: # insmod usbserial.ko
2. Install the metro-usb.ko module with: # insmod metro-usb.ko vender=0x#### product=0x#### debug=1
The vendor, product and debug parameters are optional.
Copyright: 2007 Metrologic Instruments. All rights reserved.
Copyright: 2011 Azimut Ltd. <http://azimutrzn.ru/>
Requirements: Notepad.exe
Revision History:
Date: Developer: Revisions:
------------------------------------------------------------------------------
1/12/2007 Philip Nicastro Initial release. (v1.0.0.0)
10/07/2011 Aleksey Babahin Update for new kernel (tested on 2.6.38)
Add unidirection mode support
*/
#ifndef __LINUX_USB_SERIAL_METRO
#define __LINUX_USB_SERIAL_METRO
/* Product information. */
#define FOCUS_VENDOR_ID 0x0C2E
#define FOCUS_PRODUCT_ID 0x0720
#define FOCUS_PRODUCT_ID_UNI 0x0710
#define METROUSB_SET_REQUEST_TYPE 0x40
#define METROUSB_SET_MODEM_CTRL_REQUEST 10
#define METROUSB_SET_BREAK_REQUEST 0x40
#define METROUSB_MCR_NONE 0x8 /* Deactivate DTR and RTS. */
#define METROUSB_MCR_RTS 0xa /* Activate RTS. */
#define METROUSB_MCR_DTR 0x9 /* Activate DTR. */
#define WDR_TIMEOUT 5000 /* default urb timeout. */
/* Private data structure. */
struct metrousb_private {
spinlock_t lock;
int throttled;
unsigned long control_state;
};
#endif