diff options
| author | kato <kato@FreeBSD.org> | 1997-09-19 08:48:02 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-19 08:48:02 +0000 |
| commit | 3c6b3e2f16fa8e54d5993c82bd5ef72b1b097f73 (patch) | |
| tree | f6b1f134b6edddbde987ec005b04ebb24e46b9d5 /sys/pc98 | |
| parent | 2f51fec1e137da50e8584a391593093389ce0919 (diff) | |
| download | FreeBSD-src-3c6b3e2f16fa8e54d5993c82bd5ef72b1b097f73.zip FreeBSD-src-3c6b3e2f16fa8e54d5993c82bd5ef72b1b097f73.tar.gz | |
Synchronize with sys/i386/i386/userconfig.c revision 1.93.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/userconfig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index b40d114..25e1e42 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.35 1997/09/04 13:21:23 kato Exp $ + ** $Id: userconfig.c,v 1.36 1997/09/10 08:06:35 kato Exp $ **/ /** @@ -2379,7 +2379,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.35 1997/09/04 13:21:23 kato Exp $ + * $Id: userconfig.c,v 1.36 1997/09/10 08:06:35 kato Exp $ */ #include "scbus.h" @@ -2760,7 +2760,7 @@ set_pnp_parms(CmdParm *parms) ldn=strtoul(q,&q, 0); for (p=q; *p && (*p==' ' || *p=='\t'); p++) ; if (csn < 1 || csn > MAX_PNP_CARDS || ldn >= MAX_PNP_LDN) { - printf("bad csn/ldn %d:%d\n", csn, ldn); + printf("bad csn/ldn %ld:%ld\n", csn, ldn); return 0; } for (i=0; i < MAX_PNP_LDN; i++) { @@ -3044,7 +3044,7 @@ lspnp () for (i=0; i< MAX_PNP_LDN; i++) { c = &pnp_ldn_overrides[i]; if (c->csn >0 && c->csn != 255) { - int j, pmax, mmax; + int pmax, mmax; static char pfmt[] = "port 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x "; static char mfmt[] = @@ -3068,7 +3068,7 @@ lspnp () c->enable ? "Y":"N", c->irq[0], c->irq[1], c->drq[0], c->drq[1]); if (c->flags) - printf("flags 0x%08x ",c->flags); + printf("flags 0x%08lx ",c->flags); for (pmax = 7; pmax >=0 ; pmax--) if (c->port[pmax]!=0) break; for (mmax = 3; mmax >=0 ; mmax--) @@ -3126,7 +3126,7 @@ lsdevtab(struct isa_device *dt) sprintf(line + 9, "0x%x", dt->id_iobase); sprintf(line + 20, "%d", ffs(dt->id_irq) - 1); sprintf(line + 26, "%d", dt->id_drq); - sprintf(line + 32, "0x%x", dt->id_maddr); + sprintf(line + 32, "%p", dt->id_maddr); sprintf(line + 40, "%d", dt->id_msize); /* Missing: id_msize (0 at start, useful if we can get here later). */ /* Missing: id_intr (useful if we could show it by name). */ |
