diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 2005-02-18 16:30:10 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 2005-02-18 16:30:10 +0000 |
| commit | fe1001df5f8cbe2cbdfb079b4adabb6768110d09 (patch) | |
| tree | de7d3fc90f9b69c2119bc9199ef9ae6a6cf1287b /usr.sbin | |
| parent | 8e6d32f9bc836de6157574865335308b47af726e (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ndiscvt/inf.c | 15 | ||||
| -rw-r--r-- | usr.sbin/ndiscvt/ndiscvt.c | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c index de6c34227e9e0..e872d45b8190b 100644 --- a/usr.sbin/ndiscvt/inf.c +++ b/usr.sbin/ndiscvt/inf.c @@ -246,7 +246,8 @@ dump_deviceids_pci() if (manf->vals[1] != NULL && (strcasecmp(manf->vals[1], "NT.5.1") == 0 || strcasecmp(manf->vals[1], "NTx86") == 0 || - strcasecmp(manf->vals[1], "NTx86.5.1") == 0)) { + strcasecmp(manf->vals[1], "NTx86.5.1") == 0 || + strcasecmp(manf->vals[1], "NTamd64") == 0)) { /* Handle Windows XP INF files. */ snprintf(xpsec, sizeof(xpsec), "%s.%s", manf->vals[0], manf->vals[1]); @@ -325,7 +326,8 @@ dump_deviceids_pcmcia() if (manf->vals[1] != NULL && (strcasecmp(manf->vals[1], "NT.5.1") == 0 || strcasecmp(manf->vals[1], "NTx86") == 0 || - strcasecmp(manf->vals[1], "NTx86.5.1") == 0)) { + strcasecmp(manf->vals[1], "NTx86.5.1") == 0 || + strcasecmp(manf->vals[1], "NTamd64") == 0)) { /* Handle Windows XP INF files. */ snprintf(xpsec, sizeof(xpsec), "%s.%s", manf->vals[0], manf->vals[1]); @@ -578,7 +580,8 @@ dump_regvals(void) if (manf->vals[1] != NULL && (strcasecmp(manf->vals[1], "NT.5.1") == 0 || strcasecmp(manf->vals[1], "NTx86") == 0 || - strcasecmp(manf->vals[1], "NTx86.5.1") == 0)) { + strcasecmp(manf->vals[1], "NTx86.5.1") == 0 || + strcasecmp(manf->vals[1], "NTamd64") == 0)) { is_winxp++; /* Handle Windows XP INF files. */ snprintf(sname, sizeof(sname), "%s.%s", @@ -600,9 +603,15 @@ retry: * Look for section names with .NT, unless * this is a WinXP .INF file. */ + if (is_winxp) { sprintf(sname, "%s.NTx86", assign->vals[0]); dev = find_assign(sname, "AddReg"); + if (dev == NULL) { + sprintf(sname, "%s.NT", + assign->vals[0]); + dev = find_assign(sname, "AddReg"); + } if (dev == NULL) dev = find_assign(assign->vals[0], "AddReg"); diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c index a24711ea7ad7a..b7a3d5c7db727 100644 --- a/usr.sbin/ndiscvt/ndiscvt.c +++ b/usr.sbin/ndiscvt/ndiscvt.c @@ -386,6 +386,7 @@ main(int argc, char *argv[]) fprintf(outfp, "\nextern unsigned char drv_data[];\n\n"); fprintf(outfp, "__asm__(\".data\");\n"); + fprintf(outfp, "__asm__(\".globl drv_data\");\n"); fprintf(outfp, "__asm__(\".type drv_data, @object\");\n"); fprintf(outfp, "__asm__(\".size drv_data, %d\");\n", fsize); fprintf(outfp, "__asm__(\"drv_data:\");\n"); |