From 76a119fa8f8efc9ada2463fea128c9de5261a489 Mon Sep 17 00:00:00 2001 From: skrll Date: Thu, 22 Jan 2009 07:57:17 +0000 Subject: [PATCH] Don't use dev_t now that it's 64bits. --- sys/arch/hp700/stand/common/dev_hppa.c | 4 ++-- sys/arch/hp700/stand/common/dev_hppa.h | 4 ++-- sys/arch/hp700/stand/common/libsa.h | 8 +++++--- sys/arch/hp700/stand/common/machdep.c | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sys/arch/hp700/stand/common/dev_hppa.c b/sys/arch/hp700/stand/common/dev_hppa.c index bef3c36c8ed8..ec652d1edf3a 100644 --- a/sys/arch/hp700/stand/common/dev_hppa.c +++ b/sys/arch/hp700/stand/common/dev_hppa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dev_hppa.c,v 1.8 2008/05/10 19:11:59 skrll Exp $ */ +/* $NetBSD: dev_hppa.c,v 1.9 2009/01/22 07:57:17 skrll Exp $ */ /* $OpenBSD: dev_hppa.c,v 1.5 1999/04/20 20:01:01 mickey Exp $ */ @@ -139,7 +139,7 @@ devopen(struct open_file *f, const char *fname, char **file) } void -devboot(dev_t dev, char *p) +devboot(btdev_t dev, char *p) { const char *q; if (!dev) { diff --git a/sys/arch/hp700/stand/common/dev_hppa.h b/sys/arch/hp700/stand/common/dev_hppa.h index 0d02d66571ca..ccb15e6e0c05 100644 --- a/sys/arch/hp700/stand/common/dev_hppa.h +++ b/sys/arch/hp700/stand/common/dev_hppa.h @@ -1,4 +1,4 @@ -/* $NetBSD: dev_hppa.h,v 1.4 2005/12/11 12:17:25 christos Exp $ */ +/* $NetBSD: dev_hppa.h,v 1.5 2009/01/22 07:57:17 skrll Exp $ */ /* $OpenBSD: dev_hppa.h,v 1.3 1999/04/20 20:01:01 mickey Exp $ */ @@ -9,7 +9,7 @@ struct disklabel; struct hppa_dev { - dev_t bootdev; + btdev_t bootdev; struct pz_device *pz_dev; /* device descriptor */ u_long last_blk; /* byte offset for last read blk */ size_t last_read; /* amount read last time */ diff --git a/sys/arch/hp700/stand/common/libsa.h b/sys/arch/hp700/stand/common/libsa.h index 6c5b879c8916..56e4af2ea907 100644 --- a/sys/arch/hp700/stand/common/libsa.h +++ b/sys/arch/hp700/stand/common/libsa.h @@ -1,4 +1,4 @@ -/* $NetBSD: libsa.h,v 1.6 2009/01/12 11:32:44 tsutsui Exp $ */ +/* $NetBSD: libsa.h,v 1.7 2009/01/22 07:57:17 skrll Exp $ */ /* $OpenBSD: libsa.h,v 1.7 1999/12/23 04:07:47 mickey Exp $ */ @@ -42,7 +42,9 @@ #define NENTS(a) (sizeof(a) / sizeof(a[0])) -extern dev_t bootdev; +typedef unsigned int btdev_t; + +extern btdev_t bootdev; extern struct consdev constab[]; extern struct consdev *cn_tab; @@ -75,7 +77,7 @@ void ite_putc(dev_t, int); void ite_pollc(dev_t, int); void machdep(void); -void devboot(dev_t, char *); +void devboot(btdev_t, char *); void fcacheall(void); int lif_open(const char *, struct open_file *); diff --git a/sys/arch/hp700/stand/common/machdep.c b/sys/arch/hp700/stand/common/machdep.c index bce56aa834da..874427497354 100644 --- a/sys/arch/hp700/stand/common/machdep.c +++ b/sys/arch/hp700/stand/common/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.2 2002/11/28 05:38:42 chs Exp $ */ +/* $NetBSD: machdep.c,v 1.3 2009/01/22 07:57:17 skrll Exp $ */ /* $OpenBSD: machdep.c,v 1.6 2001/06/04 22:25:52 mickey Exp $ */ @@ -43,7 +43,7 @@ extern struct stable_storage sstor; /* contents of Stable Storage */ int howto; -dev_t bootdev; +btdev_t bootdev; void machdep(void)