dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Staging: udlfb: reorganize function order

Browse source 
Reorganize the location of a few things to be closer to related code

Signed-off-by: Bernie Thompson <bernie@plugable.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bernie Thompson 2010-02-15 06:45:49 -08:00 committed by Greg Kroah-Hartman
parent 1d31a9ee69
commit cc403dc67d
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/staging/udlfb/udlfb.c
View file

@ -39,8 +39,17 @@ static struct fb_fix_screeninfo dlfb_fix = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
#define NR_USB_REQUEST_I2C_SUB_IO 0x02 /*
#define NR_USB_REQUEST_CHANNEL 0x12 * There are many DisplayLink-based products, all with unique PIDs. We are able
* to support all volume ones (circa 2009) with a single driver, so we match
* globally on VID. TODO: Probe() needs to detect when we might be running
* "future" chips, and bail on those, so a compatible driver can match.
*/
static struct usb_device_id id_table[] = {
{.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,},
{},
};
MODULE_DEVICE_TABLE(usb, id_table);
/* /*
* Inserts a specific DisplayLink controller command into the provided * Inserts a specific DisplayLink controller command into the provided
@ -252,24 +261,6 @@ error:
return retval; return retval;
} }
/*
* This is necessary before we can communicate with the display controller.
*/
static int dlfb_select_std_channel(struct dlfb_data *dev)
{
int ret;
u8 set_def_chn[] = { 0x57, 0xCD, 0xDC, 0xA7,
0x1C, 0x88, 0x5E, 0x15,
0x60, 0xFE, 0xC6, 0x97,
0x16, 0x3D, 0x47, 0xF2 };
ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
NR_USB_REQUEST_CHANNEL,
(USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0,
set_def_chn, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT);
return ret;
}
/* /*
* Query EDID from the handware, then hand it off to fbdev's edid parse * Query EDID from the handware, then hand it off to fbdev's edid parse
@ -325,18 +316,6 @@ struct dloarea {
int x2, y2; int x2, y2;
}; };
/*
* There are many DisplayLink-based products, all with unique PIDs. We are able
* to support all volume ones (circa 2009) with a single driver, so we match
* globally on VID. TODO: Probe() needs to detect when we might be running
* "future" chips, and bail on those, so a compatible driver can match.
*/
static struct usb_device_id id_table[] = {
{.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,},
{},
};
MODULE_DEVICE_TABLE(usb, id_table);
static struct usb_driver dlfb_driver; static struct usb_driver dlfb_driver;
/* thanks to Henrik Bjerregaard Pedersen for this function */ /* thanks to Henrik Bjerregaard Pedersen for this function */
@ -888,7 +867,6 @@ static int dlfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
} }
/* taken from vesafb */ /* taken from vesafb */
static int static int
dlfb_setcolreg(unsigned regno, unsigned red, unsigned green, dlfb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp, struct fb_info *info) unsigned blue, unsigned transp, struct fb_info *info)
@ -952,6 +930,24 @@ static struct fb_ops dlfb_ops = {
.fb_blank = dlfb_blank, .fb_blank = dlfb_blank,
}; };
/*
* This is necessary before we can communicate with the display controller.
*/
static int dlfb_select_std_channel(struct dlfb_data *dev)
{
int ret;
u8 set_def_chn[] = { 0x57, 0xCD, 0xDC, 0xA7,
0x1C, 0x88, 0x5E, 0x15,
0x60, 0xFE, 0xC6, 0x97,
0x16, 0x3D, 0x47, 0xF2 };
ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
NR_USB_REQUEST_CHANNEL,
(USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0,
set_def_chn, sizeof(set_def_chn), USB_CTRL_SET_TIMEOUT);
return ret;
}
static int dlfb_probe(struct usb_interface *interface, static int dlfb_probe(struct usb_interface *interface,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {

3
drivers/staging/udlfb/udlfb.h
View file

@ -26,6 +26,9 @@ struct dlfb_data {
u32 pseudo_palette[256]; u32 pseudo_palette[256];
}; };
#define NR_USB_REQUEST_I2C_SUB_IO 0x02
#define NR_USB_REQUEST_CHANNEL 0x12
static void dlfb_bulk_callback(struct urb *urb) static void dlfb_bulk_callback(struct urb *urb)
{ {
struct dlfb_data *dev_info = urb->context; struct dlfb_data *dev_info = urb->context;