mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 11:16:11 +00:00
modpost: add support for hid
Generate aliases for hid device modules to support autoloading. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
7591103c08
commit
e8c84f9a5f
3 changed files with 29 additions and 0 deletions
|
@ -67,6 +67,7 @@
|
|||
#include <linux/types.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/mod_devicetable.h> /* hid_device_id */
|
||||
#include <linux/timer.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/input.h>
|
||||
|
|
|
@ -131,6 +131,16 @@ struct usb_device_id {
|
|||
#define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
|
||||
#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
|
||||
|
||||
#define HID_ANY_ID (~0)
|
||||
|
||||
struct hid_device_id {
|
||||
__u16 bus;
|
||||
__u32 vendor;
|
||||
__u32 product;
|
||||
kernel_ulong_t driver_data
|
||||
__attribute__((aligned(sizeof(kernel_ulong_t))));
|
||||
};
|
||||
|
||||
/* s390 CCW devices */
|
||||
struct ccw_device_id {
|
||||
__u16 match_flags; /* which fields to match against */
|
||||
|
|
|
@ -206,6 +206,20 @@ static void do_usb_table(void *symval, unsigned long size,
|
|||
do_usb_entry_multi(symval + i, mod);
|
||||
}
|
||||
|
||||
/* Looks like: hid:bNvNpN */
|
||||
static int do_hid_entry(const char *filename,
|
||||
struct hid_device_id *id, char *alias)
|
||||
{
|
||||
id->vendor = TO_NATIVE(id->vendor);
|
||||
id->product = TO_NATIVE(id->product);
|
||||
|
||||
sprintf(alias, "hid:b%04X", id->bus);
|
||||
ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
|
||||
ADD(alias, "p", id->product != HID_ANY_ID, id->product);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Looks like: ieee1394:venNmoNspNverN */
|
||||
static int do_ieee1394_entry(const char *filename,
|
||||
struct ieee1394_device_id *id, char *alias)
|
||||
|
@ -745,6 +759,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
|
|||
else if (sym_is(symname, "__mod_usb_device_table"))
|
||||
/* special case to handle bcdDevice ranges */
|
||||
do_usb_table(symval, sym->st_size, mod);
|
||||
else if (sym_is(symname, "__mod_hid_device_table"))
|
||||
do_table(symval, sym->st_size,
|
||||
sizeof(struct hid_device_id), "hid",
|
||||
do_hid_entry, mod);
|
||||
else if (sym_is(symname, "__mod_ieee1394_device_table"))
|
||||
do_table(symval, sym->st_size,
|
||||
sizeof(struct ieee1394_device_id), "ieee1394",
|
||||
|
|
Loading…
Reference in a new issue