diff options
author | mdodd <mdodd@FreeBSD.org> | 2003-06-13 00:36:03 +0000 |
---|---|---|
committer | mdodd <mdodd@FreeBSD.org> | 2003-06-13 00:36:03 +0000 |
commit | 12a43e4609e292a8de9cc82d3be51302f7b129e3 (patch) | |
tree | dad996fa25d3b0f354f02985398fee0f7d56b2d5 /sys/i386/bios/smapi.c | |
parent | 56787fa7b199f3e56307c941bd464b9fcfcde7d5 (diff) | |
download | FreeBSD-src-12a43e4609e292a8de9cc82d3be51302f7b129e3.zip FreeBSD-src-12a43e4609e292a8de9cc82d3be51302f7b129e3.tar.gz |
Despite my best efforts the Linux way of doing this is the only
way that works correctly.
- Remove unused function.
- Move declaration of variables to .S file.
Diffstat (limited to 'sys/i386/bios/smapi.c')
-rw-r--r-- | sys/i386/bios/smapi.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c index fd6b1fe..5b90896 100644 --- a/sys/i386/bios/smapi.c +++ b/sys/i386/bios/smapi.c @@ -67,9 +67,8 @@ struct smapi_softc { struct smapi_bios_header *header; }; -u_long smapi32_offset; -u_short smapi32_segment; -#define SMAPI32_SEGMENT 0x18 +extern u_long smapi32_offset; +extern u_short smapi32_segment; devclass_t smapi_devclass; @@ -123,14 +122,8 @@ smapi_ioctl (dev, cmd, data, fflag, td) error = 0; break; case SMAPIOCGFUNCTION: -#if 1 - smapi32_segment = SMAPI32_SEGMENT; smapi32_offset = sc->smapi32_entry; - error = smapi32( -#else - error = smapi32_new(sc->smapi32_entry, SMAPI32_SEGMENT, -#endif - (struct smapi_bios_parameter *)data, + error = smapi32((struct smapi_bios_parameter *)data, (struct smapi_bios_parameter *)data); break; default: |