aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2009-12-18 14:52:39 -0500
committerRusty Russell <rusty@rustcorp.com.au>2010-05-19 04:03:39 -0400
commitfedb3d27d9e8606b3867b5ae49d6258458a07a72 (patch)
treee57e59e48109ec105ed31480d649fa934d5d86f9 /scripts
parent031ffd1711bd8bf334ebcbe8ebe34845e6d4678f (diff)
MODULE_DEVICE_TABLE(isapnp, ...) does nothing
On Monday 23 November 2009 04:29:53 Rusty Russell wrote: > On Mon, 23 Nov 2009 07:31:57 am Ondrej Zary wrote: > > The problem is that > > scripts/mod/file2alias.c simply ignores isapnp. > > AFAICT it always has, and noone has complained until now. Perhaps > something was still reading /lib/modules/`uname -r`/modules.isapnpmap? The patch below works fine (at least with Debian). It needs your first patch that moves the definitions to mod_devicetable.h. Verified that aliases for these modules are generated correctly: drivers/media/radio/radio-sf16fmi.c drivers/net/ne.c drivers/net/3c515.c drivers/net/smc-ultra.c drivers/pcmcia/i82365.c drivers/scsi/aha1542.c drivers/scsi/aha152x.c drivers/scsi/sym53c416.c drivers/scsi/g_NCR5380.c Tested with RTL8019AS (ne), AVA-1505AE (aha152x) and dtc436e (g_NCR5380) cards - they now work automatically. Generate pnp:d aliases for isapnp_device_tables. This allows udev to load these modules automatically. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index df90f31d14bf..808c20d81f8d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -806,6 +806,19 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
806 return 1; 806 return 1;
807} 807}
808 808
809/* looks like: "pnp:dD" */
810static int do_isapnp_entry(const char *filename,
811 struct isapnp_device_id *id, char *alias)
812{
813 sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
814 'A' + ((id->vendor >> 2) & 0x3f) - 1,
815 'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1,
816 'A' + ((id->vendor >> 8) & 0x1f) - 1,
817 (id->function >> 4) & 0x0f, id->function & 0x0f,
818 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
819 return 1;
820}
821
809/* Ignore any prefix, eg. some architectures prepend _ */ 822/* Ignore any prefix, eg. some architectures prepend _ */
810static inline int sym_is(const char *symbol, const char *name) 823static inline int sym_is(const char *symbol, const char *name)
811{ 824{
@@ -957,6 +970,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
957 do_table(symval, sym->st_size, 970 do_table(symval, sym->st_size,
958 sizeof(struct zorro_device_id), "zorro", 971 sizeof(struct zorro_device_id), "zorro",
959 do_zorro_entry, mod); 972 do_zorro_entry, mod);
973 else if (sym_is(symname, "__mod_isapnp_device_table"))
974 do_table(symval, sym->st_size,
975 sizeof(struct isapnp_device_id), "isa",
976 do_isapnp_entry, mod);
960 free(zeros); 977 free(zeros);
961} 978}
962 979