NetBSD Problem Report #23711
Received: (qmail 21768 invoked by uid 605); 10 Dec 2003 14:20:53 -0000
Message-Id: <200312101420.hBAEKnJ4023193@mmgserv.m2g.org>
Date: Wed, 10 Dec 2003 23:20:49 +0900 (JST)
From: taya@ba2.so-net.ne.jp
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: taya@ba2.so-net.ne.jp
To: gnats-bugs@gnats.NetBSD.org
Subject: -current build failes on cobalt
X-Send-Pr-Version: 3.95
>Number: 23711
>Category: port-cobalt
>Synopsis: -current build failes on cobalt
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: tsutsui
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Wed Dec 10 14:21:00 +0000 2003
>Closed-Date: Sun Dec 14 12:02:03 +0000 2003
>Last-Modified: Sun Dec 14 12:02:03 +0000 2003
>Originator: Shin'ichiro TAYA
>Release: NetBSD 1.6ZG
>Organization:
--
Shin'ichiro TAYA <taya@ba2.so-net.ne.jp>
>Environment:
System: NetBSD mmgserv.m2g.org 1.6ZG NetBSD 1.6ZG (MMGSERV) #4: Sun Dec 7 20:50:20 JST 2003 taya@mmgserv.m2g.org:/export/NetBSD/NetBSD-current/src/sys/arch/i386/compile/MMGSERV i386
Architecture: i386
Machine: i386
>Description:
-current build failes on cobalt as follows
dependall ===> compile
dependall ===> include
dependall ===> stand
dependall ===> stand/installkernel
dependall ===> stand/boot
depending the kern library objects
depending the z library objects
depending the sa library objects
# create sa/loadfile_ecoff.d
CC=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmkdep -f loadfile_ecoff.d -- -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../.. -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -DCONS_SERIAL -DCOMBASE=0xbc800000 -DCOMPORT=0x0 -DCOMSPEED=115200 -DCOMPROBE=0xa020001c -DNETBSD_VERS='"1.6ZG"' -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include -DCOMPAT_UFS -D__INTERNAL_LIBSA_CREAD -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa/loadfile_ecoff.c
In file included from /export/NetBSD/NetBSD-current/src/sys/lib/libsa/loadfile_ecoff.c:56:
/export/NetBSD/NetBSD-current/src/sys/lib/libsa/loadfile.h:74:34: machine/loadfile_machdep.h: No such file or directory
nbmkdep: compile failed.
*** Failed target: loadfile_ecoff.d
*** Failed command: CC=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmkdep -f loadfile_ecoff.d -- -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../.. -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -DCONS_SERIAL -DCOMBASE=0xbc800000 -DCOMPORT=0x0 -DCOMSPEED=115200 -DCOMPROBE=0xa020001c -DNETBSD_VERS='"1.6ZG"' -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include -DCOMPAT_UFS -D__INTERNAL_LIBSA_CREAD -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa/loadfile_ecoff.c
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt/lib/sa
*** Failed target: dependsalib
*** Failed command: cd /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt/lib/sa && /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake -f /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa/Makefile SADIR=/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa CC=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc CFLAGS=-Os\ -mmemcpy\ -ffreestanding\ -mno-abicalls\ -msoft-float\ -G\ 128\ AS=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-as AFLAGS=\ -D_LOCORE\ -D_KERNEL\ -DASSEMBLER\ -mno-abicalls LORDER=NM=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-nm\ MKTEMP=/export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmktemp\ /export/NetBSD/NetBSD-current/TOOL.i386/bin/nblorder TSORT=/export/NetBSD/NetBSD-current/TOOL.i386/bin/nbtsort\ -q LD=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-ld STRIP=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-strip!
AR=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-ar NM=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-nm RANLIB=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-ranlib SIZE=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-size MACHINE=cobalt MACHINE_ARCH=mipsel SACPPFLAGS=-nostdinc\ -D_STANDALONE\ -DNO_ABICALLS\ -D_NO_PROM_DEFINES\ -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt\ -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../..\ -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa\ -DCONS_SERIAL\ -DCOMBASE=0xbc800000\ -DCOMPORT=0x0\ -DCOMSPEED=115200\ -DCOMPROBE=0xa020001c\ -DNETBSD_VERS=\'\"1.6ZG\"\'\ -nostdinc\ -isystem\ /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include SAMISCCPPFLAGS= SA_USE_LOADFILE=yes SA_USE_CREAD=yes depend
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot
*** Failed target: dependall-boot
*** Failed command: targ=dependall;dir=boot; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> stand/$dir"; cd "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/$dir"; /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake "_THISDIR_=stand/$dir/" $targ; ;; esac
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand
*** Failed target: dependall-stand
*** Failed command: targ=dependall;dir=stand; case "$dir" in /*) echo "$targ ===> $dir"; cd "$dir"; /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; *) echo "$targ ===> $dir"; cd "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/$dir"; /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake "_THISDIR_=$dir/" $targ; ;; esac
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt
>How-To-Repeat:
cd /usr/src; ./build -m cobalt build
>Fix:
>Release-Note:
>Audit-Trail:
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
To: taya@ba2.so-net.ne.jp
Cc: gnats-bugs@gnats.NetBSD.org, tsutsui@ceres.dti.ne.jp
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 00:08:49 +0900
In article <200312101420.hBAEKnJ4023193@mmgserv.m2g.org>
taya@ba2.so-net.ne.jp wrote:
> >Description:
> -current build failes on cobalt as follows
> /export/NetBSD/NetBSD-current/src/sys/lib/libsa/loadfile.h:74:34:
> machine/loadfile_machdep.h: No such file or directory
> nbmkdep: compile failed.
I saw the similar problems (symlinks are not created on target dependall)
on news68k and prep. How about the attached patch?
---
Index: Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 26 Oct 2003 07:25:36 -0000 1.3
+++ Makefile 10 Dec 2003 15:04:48 -0000
@@ -67,6 +67,8 @@
SRCS+= vers.c
CLEANFILES+= vers.c
+.include <bsd.prog.mk>
+
### find out what to use for libkern
KERN_AS= library
.include "${S}/lib/libkern/Makefile.inc"
@@ -99,8 +101,6 @@
cleanlibdir:
rm -rf lib
-
-.include <bsd.prog.mk>
/usr/lib/crt0.o:
true
---
Izumi Tsutsui
tsutsui@ceres.dti.ne.jp
From: "Shin'ichiro TAYA" <taya@ba2.so-net.ne.jp>
To: tsutsui@ceres.dti.ne.jp
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 00:54:03 +0900 (JST)
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 00:08:49 +0900
> I saw the similar problems (symlinks are not created on target dependall)
> on news68k and prep. How about the attached patch?
The problem has gone but another problem has occured.
Maybe I should submit another PR...
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 93: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 94: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 95: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
sh /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../conf/newvers_stand.sh /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/version "cobalt"
# create boot/vers.d
CC=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmkdep -f vers.d -- -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../.. -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -DCONS_SERIAL -DCOMBASE=0xbc800000 -DCOMPORT=0x0 -DCOMSPEED=115200 -DCOMPROBE=0xa0200 01c -DNETBSD_VERS='"1.6ZG"' -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include vers.c
# create boot/.depend
rm -f .depend
CC=/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmkdep -d -f .depend -s .o\ .ln boot.d clock.d com.d conf.d cons.d devopen.d ns16550.d pciide.d prf.d start.d vers.d wd.d wdc.d
depending the kern library objects
depending the z library objects
depending the sa library objects
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 93: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 94: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
nbmake: "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" line 95: warning: duplicate script for target "boot" ignored
nbmake: "/export/NetBSD/NetBSD-current/src/share/mk/bsd.prog.mk" line 181: warning: using previous script for "boot" defined here
# compile boot/wd.o
/export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc -Os -mmemcpy -ffreestanding -mno-abicalls -msoft-float -G 128 -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../.. -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -DCONS_SERIAL -DCOMBASE=0xbc800000 -DCOMPORT=0x0 -DCOMSPEED=115200 -DCOMPROBE=0xa020001c -DN ETBSD_VERS='"1.6ZG"' -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include -c /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c: In function `wd_get_params':
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:70: error: `WDC_CAP_LBA48' undeclared (first use in this function)
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:70: error: (Each undeclared identifier is reported only once
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:70: error: for each function it appears in.)
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c: In function `wdopen':
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:206: warning: `u_int8_t' is promoted to `int' when passed through `...'
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:206: warning: (so you should pass `int' not `u_int8_t' to `va_arg')
/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:207: warning: `u_int8_t' is promoted to `int' when passed through `...'
*** Failed target: wd.o
*** Failed command: /export/NetBSD/NetBSD-current/TOOL.i386/bin/mipsel--netbsd-gcc -Os -mmemcpy -ffreestanding -mno-abicalls -msoft-float -G 128 -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/obj.cobalt -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../.. -I/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/../../../../lib/libsa -DCONS_SERIAL -DCOMBASE=0xbc800000 -DCOMPORT=0x0 -DCOMSPEED=115200 -DCOMPRO BE=0xa020001c -DNETBSD_VERS='"1.6ZG"' -nostdinc -isystem /export/NetBSD/NetBSD-current/DEST.cobalt/usr/include -c /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot
*** Failed target: dependall
*** Failed command: cd /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot; /export/NetBSD/NetBSD-current/TOOL.i386/bin/nbmake realall
*** Error code 1
Stop.
nbmake: stopped in /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
To: taya@ba2.so-net.ne.jp
Cc: gnats-bugs@gnats.NetBSD.org, tsutsui@ceres.dti.ne.jp
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 02:38:43 +0900
In article <20031211.005403.74754224.taya@m2g.org>
taya@ba2.so-net.ne.jp wrote:
> /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:70: \
> error: `WDC_CAP_LBA48' undeclared (first use in this function)
WDC_CAP_LBA48 was renamed to ATA_CMD2_LBA48, this one should be trivial.
> nbmake: \
> "/export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/Makefile" \
> line 93: warning: duplicate script for target "boot" ignored
> /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:206: \
> warning: `u_int8_t' is promoted to `int' when passed through `...'
> /export/NetBSD/NetBSD-current/src/sys/arch/cobalt/stand/boot/wd.c:206: \
> warning: (so you should pass `int' not `u_int8_t' to `va_arg')
How about this patch? (compiles with 1.6ZF sources, but not tested)
Index: boot/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- boot/Makefile 26 Oct 2003 07:25:36 -0000 1.3
+++ boot/Makefile 10 Dec 2003 17:33:00 -0000
@@ -1,11 +1,12 @@
# $NetBSD: Makefile,v 1.3 2003/10/26 07:25:36 lukem Exp $
-.include <bsd.sys.mk> # for HOST_SH
+NOMAN= # defined
+
+.include <bsd.own.mk>
S= ${.CURDIR}/../../../..
MIPS= ${S}/arch/mips
COBALT= ${S}/arch/cobalt
-PROG= ${BOOTPROG}
# .PATH: ${.CURDIR}/../common
@@ -80,7 +81,7 @@
SAMISCMAKEFLAGS+=SA_USE_LOADFILE=yes SA_USE_CREAD=yes
.include "${S}/lib/libsa/Makefile.inc"
-LIBS= ${KERNLIB} ${SALIB} ${ZLIB} ${KERNLIB}
+LIBS= ${KERNLIB} ${SALIB} ${ZLIB}
.PHONY: vers.c
vers.c: ${.CURDIR}/version
@@ -92,7 +93,6 @@
gzip -c9 ${PROG} > ${PROG}.gz
@${SIZE} ${PROG}
-MAN=
CLEANFILES+= ${PROG}.map ${PROG}.elf ${PROG}.gz
cleandir distclean: cleanlibdir
@@ -101,6 +101,3 @@
rm -rf lib
.include <bsd.prog.mk>
-
-/usr/lib/crt0.o:
- true
Index: boot/pciide.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/pciide.c,v
retrieving revision 1.1
diff -u -r1.1 pciide.c
--- boot/pciide.c 25 Jun 2003 17:24:22 -0000 1.1
+++ boot/pciide.c 10 Dec 2003 17:33:00 -0000
@@ -43,7 +43,7 @@
int
pciide_init(chp, unit)
struct channel_softc *chp;
- u_int8_t *unit;
+ int *unit;
{
u_long bpa, addr;
int compatchan = 0;
Index: boot/wd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/wd.c,v
retrieving revision 1.2
diff -u -r1.2 wd.c
--- boot/wd.c 8 Oct 2003 04:25:44 -0000 1.2
+++ boot/wd.c 10 Dec 2003 17:33:00 -0000
@@ -199,12 +199,12 @@
{
int error;
va_list ap;
- u_int8_t unit, part;
+ int unit, part;
struct wd_softc *wd;
va_start(ap, f);
- unit = va_arg(ap, u_int8_t);
- part = va_arg(ap, u_int8_t);
+ unit = va_arg(ap, int);
+ part = va_arg(ap, int);
va_end(ap);
DPRINTF(("wdopen: %d:%d\n", unit, part));
Index: boot/wdc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/wdc.c,v
retrieving revision 1.3
diff -u -r1.3 wdc.c
--- boot/wdc.c 10 Nov 2003 08:51:52 -0000 1.3
+++ boot/wdc.c 10 Dec 2003 17:33:00 -0000
@@ -181,7 +181,7 @@
int
wdc_init(sc, unit)
struct wd_softc *sc;
- u_int8_t *unit;
+ int *unit;
{
if (pciide_init(&sc->sc_channel, unit) != 0)
return (ENXIO);
Index: boot/wdvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/stand/boot/wdvar.h,v
retrieving revision 1.2
diff -u -r1.2 wdvar.h
--- boot/wdvar.h 8 Oct 2003 04:25:44 -0000 1.2
+++ boot/wdvar.h 10 Dec 2003 17:33:00 -0000
@@ -58,8 +58,8 @@
#define WDF_LBA48 0x0002
u_int16_t sc_flags;
- u_int8_t sc_part;
- u_int8_t sc_unit;
+ int sc_part;
+ int sc_unit;
u_int64_t sc_capacity;
@@ -84,12 +84,12 @@
u_int64_t r_blkno;
};
-int wdc_init (struct wd_softc*, u_int8_t*);
+int wdc_init (struct wd_softc*, int*);
int wdccommand (struct wd_softc*, struct wdc_command*);
int wdccommandext (struct wd_softc*, struct wdc_command*);
int wdc_exec_read (struct wd_softc*, u_int8_t, daddr_t, void*);
int wdc_exec_identify (struct wd_softc*, void*);
-int pciide_init (struct channel_softc*, u_int8_t*);
+int pciide_init (struct channel_softc*, int*);
#endif /* _STAND_WDVAR_H */
---
Izumi Tsutsui
tsutsui@ceres.dti.ne.jp
From: "Shin'ichiro TAYA" <taya@ba2.so-net.ne.jp>
To: tsutsui@ceres.dti.ne.jp
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 08:20:59 +0900 (JST)
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
Subject: Re: port-cobalt/23711: -current build failes on cobalt
Date: Thu, 11 Dec 2003 02:38:43 +0900
> WDC_CAP_LBA48 was renamed to ATA_CMD2_LBA48, this one should be trivial.
> How about this patch? (compiles with 1.6ZF sources, but not tested)
with your patch and manually modified WDC_CAP_LBA48 -> ATA_CMD2_LBA48,
all errors and warnings has gone!
thak you!
State-Changed-From-To: open->analyzed
State-Changed-By: tsutsui
State-Changed-When: Sun Dec 14 04:10:14 UTC 2003
State-Changed-Why:
Patch provided.
Responsible-Changed-From-To: port-cobalt-maintainer->tsutsui
Responsible-Changed-By: tsutsui
Responsible-Changed-When: Sun Dec 14 04:10:14 UTC 2003
Responsible-Changed-Why:
I'll check the patch on my RaQ2.
State-Changed-From-To: analyzed->closed
State-Changed-By: tsutsui
State-Changed-When: Sun Dec 14 12:01:34 UTC 2003
State-Changed-Why:
Fix confirmed and comitted.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.