CVS commit: src/sys/arch/hppa/stand/common
Module Name:src Committed By: christos Date: Tue Jan 8 19:14:08 UTC 2019 Modified Files: src/sys/arch/hppa/stand/common: pdc.c Log Message: no need for To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/stand/common/pdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/common/pdc.c diff -u src/sys/arch/hppa/stand/common/pdc.c:1.3 src/sys/arch/hppa/stand/common/pdc.c:1.4 --- src/sys/arch/hppa/stand/common/pdc.c:1.3 Tue Jan 8 12:14:52 2019 +++ src/sys/arch/hppa/stand/common/pdc.c Tue Jan 8 14:14:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.3 2019/01/08 17:14:52 christos Exp $ */ +/* $NetBSD: pdc.c,v 1.4 2019/01/08 19:14:08 christos Exp $ */ /* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */ @@ -71,7 +71,6 @@ #include #include #include -#include #include #include "dev_hppa.h"
CVS commit: src/sys/arch/hppa/stand/common
Module Name:src Committed By: christos Date: Tue Jan 8 17:14:52 UTC 2019 Modified Files: src/sys/arch/hppa/stand/common: pdc.c Log Message: Include for DEV_BSIZE/DEV_BSHIFT To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/common/pdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/common/pdc.c diff -u src/sys/arch/hppa/stand/common/pdc.c:1.2 src/sys/arch/hppa/stand/common/pdc.c:1.3 --- src/sys/arch/hppa/stand/common/pdc.c:1.2 Wed Sep 5 03:32:45 2018 +++ src/sys/arch/hppa/stand/common/pdc.c Tue Jan 8 12:14:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.2 2018/09/05 07:32:45 riastradh Exp $ */ +/* $NetBSD: pdc.c,v 1.3 2019/01/08 17:14:52 christos Exp $ */ /* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */ @@ -61,6 +61,7 @@ * Utah $Hdr: pdc.c 1.8 92/03/14$ */ +#include #include #include "libsa.h" #include
CVS commit: src/sys/arch/hppa/stand
Module Name:src
Committed By: skrll
Date: Tue Nov 13 21:22:38 UTC 2018
Modified Files:
src/sys/arch/hppa/stand: Makefile.buildboot
src/sys/arch/hppa/stand/xxboot: Makefile
Log Message:
Apply -fno-delete-null-pointer-checks so PAGE0 is handled correctly
netinstall.lif works again
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/stand/Makefile.buildboot
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/xxboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/Makefile.buildboot
diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.5 src/sys/arch/hppa/stand/Makefile.buildboot:1.6
--- src/sys/arch/hppa/stand/Makefile.buildboot:1.5 Tue Nov 13 21:20:11 2018
+++ src/sys/arch/hppa/stand/Makefile.buildboot Tue Nov 13 21:22:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.5 2018/11/13 21:20:11 skrll Exp $
+# $NetBSD: Makefile.buildboot,v 1.6 2018/11/13 21:22:37 skrll Exp $
NOPIE=yes
NOSSP=yes
@@ -32,7 +32,7 @@ BINMODE= 444
CPPFLAGS+= -nostdinc -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \
-I${.OBJDIR}
-CFLAGS+= -Os -msoft-float -Wno-main
+CFLAGS+= -Os -fno-delete-null-pointer-checks -msoft-float -Wno-main
CFLAGS+= -fno-builtin
CFLAGS+= -mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0
Index: src/sys/arch/hppa/stand/xxboot/Makefile
diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.2 src/sys/arch/hppa/stand/xxboot/Makefile:1.3
--- src/sys/arch/hppa/stand/xxboot/Makefile:1.2 Sun Feb 21 14:50:05 2016
+++ src/sys/arch/hppa/stand/xxboot/Makefile Tue Nov 13 21:22:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/02/21 14:50:05 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/11/13 21:22:38 skrll Exp $
NODEBUG=yes
PROG= xxboot
@@ -15,7 +15,7 @@ CPPFLAGS+= -D__daddr_t=int32_t
# ANSI C feature prevents from being relocatable
#CPPFLAGS+= -traditional # would be best
CPPFLAGS+= -Dconst=
-COPTS+= -Os -funsigned-char -mdisable-fpregs -mpa-risc-1-0
+COPTS+= -Os -fno-delete-null-pointer-checks -funsigned-char -mdisable-fpregs -mpa-risc-1-0
.include
CVS commit: src/sys/arch/hppa/stand
Module Name:src
Committed By: skrll
Date: Tue Nov 13 21:20:11 UTC 2018
Modified Files:
src/sys/arch/hppa/stand: Makefile.buildboot
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/stand/Makefile.buildboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/Makefile.buildboot
diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.4 src/sys/arch/hppa/stand/Makefile.buildboot:1.5
--- src/sys/arch/hppa/stand/Makefile.buildboot:1.4 Tue Aug 29 09:17:43 2017
+++ src/sys/arch/hppa/stand/Makefile.buildboot Tue Nov 13 21:20:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.4 2017/08/29 09:17:43 christos Exp $
+# $NetBSD: Makefile.buildboot,v 1.5 2018/11/13 21:20:11 skrll Exp $
NOPIE=yes
NOSSP=yes
@@ -24,7 +24,7 @@ S= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../common
SRCS= ${PROGSOURCE} ${COMMONSOURCE} ${DRIVERSOURCE}
-NOMAN=
+NOMAN=
STRIPFLAG=
BINMODE= 444
@@ -44,7 +44,7 @@ CPPFLAGS+= -DNO_NET
COMMONSOURCE= cons.c dev_hppa.c dk.c itecons.c \
machdep.c milli_tiny.S pdc.c time.c
-DRIVERSOURCE=
+DRIVERSOURCE=
### find out what to use for libkern
KERN_AS= library
CVS commit: src/sys/arch/hppa/stand/common
Module Name:src
Committed By: riastradh
Date: Wed Sep 5 07:32:45 UTC 2018
Modified Files:
src/sys/arch/hppa/stand/common: pdc.c
Log Message:
One more min->uimin straggler confirmed by 201809042300Z autobuild.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/common/pdc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/common/pdc.c
diff -u src/sys/arch/hppa/stand/common/pdc.c:1.1 src/sys/arch/hppa/stand/common/pdc.c:1.2
--- src/sys/arch/hppa/stand/common/pdc.c:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/common/pdc.c Wed Sep 5 07:32:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: pdc.c,v 1.2 2018/09/05 07:32:45 riastradh Exp $ */
/* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */
@@ -101,7 +101,7 @@ pdc_init(void)
err = (*pdc)(PDC_STABLE, PDC_STABLE_SIZE, pdcbuf, 0, 0);
if (err >= 0) {
- sstorsiz = min(pdcbuf[0],sizeof(sstor));
+ sstorsiz = uimin(pdcbuf[0],sizeof(sstor));
err = (*pdc)(PDC_STABLE, PDC_STABLE_READ, 0, &sstor, sstorsiz);
}
@@ -203,7 +203,7 @@ iodcstrategy(void *devdata, int rw, dadd
if (dp->last_blk <= blk && (dp->last_blk + dp->last_read) > blk) {
twiddle();
offset = blk - dp->last_blk;
- xfer = min(dp->last_read - offset, size);
+ xfer = uimin(dp->last_read - offset, size);
size -= xfer;
blk += xfer;
#ifdef PDCDEBUG
CVS commit: src/sys/arch/hppa/stand/cdboot
Module Name:src
Committed By: skrll
Date: Fri Sep 1 07:29:56 UTC 2017
Modified Files:
src/sys/arch/hppa/stand/cdboot: ld.script
Log Message:
Use the same linker script as sys/arch/hppa/stand/boot and fix the gcc
5.3 problem here as well.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/cdboot/ld.script
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/cdboot/ld.script
diff -u src/sys/arch/hppa/stand/cdboot/ld.script:1.1 src/sys/arch/hppa/stand/cdboot/ld.script:1.2
--- src/sys/arch/hppa/stand/cdboot/ld.script:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/cdboot/ld.script Fri Sep 1 07:29:56 2017
@@ -1,6 +1,6 @@
-/* $NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: ld.script,v 1.2 2017/09/01 07:29:56 skrll Exp $ */
-/* $OpenBSD: ld.script,v 1.1 2003/03/28 22:42:26 mickey Exp $ */
+/* $OpenBSD: ld.script,v 1.2 1999/04/20 20:02:37 mickey Exp $ */
OUTPUT_FORMAT("elf32-hppa")
OUTPUT_ARCH(hppa)
@@ -12,18 +12,18 @@ SECTIONS {
. = + SIZEOF_HEADERS;
.text : {
*(.text)
- *(.text.*)
+ *(.text.1)
*(.rodata)
*(.rodata1)
*($CODE$)
- etext = .;
- } = 0x08000240
+ etext = ABSOLUTE(.);
+ } = 0x08000240 /* nop */
/* Read-write sections, merged into data segment: */
.data : {
$global$ = .;
*(.data)
- *(.data1)
+ *(.data*)
*(.sdata)
*(.sdata2)
*(.dynamic)
CVS commit: src/sys/arch/hppa/stand/boot
Module Name:src
Committed By: skrll
Date: Tue Aug 29 19:14:04 UTC 2017
Modified Files:
src/sys/arch/hppa/stand/boot: ld.script
Log Message:
Ensure all data is captured under the edata symbol for srt0.S to relocate
it correctly.
gcc 5.3 marks some data as .data.rel.local, .data.rel or .data.rel.ro
port-hppa/52484: lif images from -8 and HEAD not loadable/bootable over network
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/boot/ld.script
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/boot/ld.script
diff -u src/sys/arch/hppa/stand/boot/ld.script:1.1 src/sys/arch/hppa/stand/boot/ld.script:1.2
--- src/sys/arch/hppa/stand/boot/ld.script:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/boot/ld.script Tue Aug 29 19:14:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: ld.script,v 1.2 2017/08/29 19:14:04 skrll Exp $ */
/* $OpenBSD: ld.script,v 1.2 1999/04/20 20:02:37 mickey Exp $ */
@@ -23,7 +23,7 @@ SECTIONS {
.data : {
$global$ = .;
*(.data)
- *(.data1)
+ *(.data*)
*(.sdata)
*(.sdata2)
*(.dynamic)
CVS commit: src/sys/arch/hppa/stand
Module Name:src Committed By: christos Date: Tue Aug 29 09:17:43 UTC 2017 Modified Files: src/sys/arch/hppa/stand: Makefile.buildboot Makefile.inc Log Message: disable PIE and SSP To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/stand/Makefile.buildboot \ src/sys/arch/hppa/stand/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/Makefile.buildboot diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.3 src/sys/arch/hppa/stand/Makefile.buildboot:1.4 --- src/sys/arch/hppa/stand/Makefile.buildboot:1.3 Sat Apr 8 15:53:20 2017 +++ src/sys/arch/hppa/stand/Makefile.buildboot Tue Aug 29 05:17:43 2017 @@ -1,5 +1,7 @@ -# $NetBSD: Makefile.buildboot,v 1.3 2017/04/08 19:53:20 christos Exp $ +# $NetBSD: Makefile.buildboot,v 1.4 2017/08/29 09:17:43 christos Exp $ +NOPIE=yes +NOSSP=yes NODEBUG=yes RELOC= 12 HEAP_LIMIT=0x1c Index: src/sys/arch/hppa/stand/Makefile.inc diff -u src/sys/arch/hppa/stand/Makefile.inc:1.3 src/sys/arch/hppa/stand/Makefile.inc:1.4 --- src/sys/arch/hppa/stand/Makefile.inc:1.3 Sun Feb 21 09:50:05 2016 +++ src/sys/arch/hppa/stand/Makefile.inc Tue Aug 29 05:17:43 2017 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.3 2016/02/21 14:50:05 christos Exp $ +# $NetBSD: Makefile.inc,v 1.4 2017/08/29 09:17:43 christos Exp $ +NOSSP=yes NOPIE=yes NOCTF=yes BINDIR= /usr/mdec
CVS commit: src/sys/arch/hppa/stand
Module Name:src Committed By: christos Date: Sun Feb 21 14:50:05 UTC 2016 Modified Files: src/sys/arch/hppa/stand: Makefile.buildboot Makefile.inc src/sys/arch/hppa/stand/xxboot: Makefile Log Message: move the NODEBUG to the boot blocks only. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/Makefile.buildboot cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/Makefile.inc cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/Makefile.buildboot diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.1 src/sys/arch/hppa/stand/Makefile.buildboot:1.2 --- src/sys/arch/hppa/stand/Makefile.buildboot:1.1 Mon Feb 24 02:23:43 2014 +++ src/sys/arch/hppa/stand/Makefile.buildboot Sun Feb 21 09:50:05 2016 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile.buildboot,v 1.1 2014/02/24 07:23:43 skrll Exp $ +# $NetBSD: Makefile.buildboot,v 1.2 2016/02/21 14:50:05 christos Exp $ +NODEBUG=yes RELOC= 12 HEAP_LIMIT=0x1c #DEBUGFLAGS=-DDEBUG Index: src/sys/arch/hppa/stand/Makefile.inc diff -u src/sys/arch/hppa/stand/Makefile.inc:1.2 src/sys/arch/hppa/stand/Makefile.inc:1.3 --- src/sys/arch/hppa/stand/Makefile.inc:1.2 Sat Feb 20 22:33:18 2016 +++ src/sys/arch/hppa/stand/Makefile.inc Sun Feb 21 09:50:05 2016 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.2 2016/02/21 03:33:18 christos Exp $ +# $NetBSD: Makefile.inc,v 1.3 2016/02/21 14:50:05 christos Exp $ NOPIE=yes NOCTF=yes -NODEBUG=yes BINDIR= /usr/mdec .include Index: src/sys/arch/hppa/stand/xxboot/Makefile diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.1 src/sys/arch/hppa/stand/xxboot/Makefile:1.2 --- src/sys/arch/hppa/stand/xxboot/Makefile:1.1 Mon Feb 24 02:23:43 2014 +++ src/sys/arch/hppa/stand/xxboot/Makefile Sun Feb 21 09:50:05 2016 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2014/02/24 07:23:43 skrll Exp $ +# $NetBSD: Makefile,v 1.2 2016/02/21 14:50:05 christos Exp $ +NODEBUG=yes PROG= xxboot NOMAN= # defined SRCS= start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
CVS commit: src/sys/arch/hppa/stand
Module Name:src Committed By: christos Date: Sun Feb 21 03:33:18 UTC 2016 Modified Files: src/sys/arch/hppa/stand: Makefile.inc Log Message: No debug, pic, or ctf for standalone code. - debug makes things not fit - ctf is useless - pic does not work with the function call convention standalone uses To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/Makefile.inc diff -u src/sys/arch/hppa/stand/Makefile.inc:1.1 src/sys/arch/hppa/stand/Makefile.inc:1.2 --- src/sys/arch/hppa/stand/Makefile.inc:1.1 Mon Feb 24 02:23:43 2014 +++ src/sys/arch/hppa/stand/Makefile.inc Sat Feb 20 22:33:18 2016 @@ -1,8 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/02/24 07:23:43 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.2 2016/02/21 03:33:18 christos Exp $ +NOPIE=yes +NOCTF=yes +NODEBUG=yes BINDIR= /usr/mdec -.include +.include COPTS+= -Wno-pointer-sign COPTS+= -fno-strict-aliasing
CVS commit: src/sys/arch/hppa/stand/mkboot
Module Name:src Committed By: christos Date: Thu Jan 21 17:00:23 UTC 2016 Modified Files: src/sys/arch/hppa/stand/mkboot: mkboot.c Log Message: PR/50684: David Binderman: Fix memory leak To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/mkboot/mkboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/stand/mkboot/mkboot.c diff -u src/sys/arch/hppa/stand/mkboot/mkboot.c:1.1 src/sys/arch/hppa/stand/mkboot/mkboot.c:1.2 --- src/sys/arch/hppa/stand/mkboot/mkboot.c:1.1 Mon Feb 24 02:23:43 2014 +++ src/sys/arch/hppa/stand/mkboot/mkboot.c Thu Jan 21 12:00:23 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: mkboot.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ +/* $NetBSD: mkboot.c,v 1.2 2016/01/21 17:00:23 christos Exp $ */ /* $OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp $ */ @@ -234,7 +234,7 @@ putfile(char *from_file, int to) int from, check_sum = 0; struct hppa_lifload load; Elf32_External_Ehdr elf_header; - Elf32_External_Phdr *elf_segments; + Elf32_External_Phdr *elf_segments = NULL; int i, header_count, memory_needed, elf_load_image_segment; if ((from = open(from_file, O_RDONLY)) < 0) @@ -356,6 +356,7 @@ putfile(char *from_file, int to) if (close(from) < 0) err(1, "%s", from_file); + free(elf_segments); return total; }
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Sun Dec 13 18:38:23 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: iplsum.c
Log Message:
PR/50532: David Binderman: Add missing fclose.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/iplsum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/xxboot/iplsum.c
diff -u src/sys/arch/hppa/stand/xxboot/iplsum.c:1.1 src/sys/arch/hppa/stand/xxboot/iplsum.c:1.2
--- src/sys/arch/hppa/stand/xxboot/iplsum.c:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/iplsum.c Sun Dec 13 13:38:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iplsum.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: iplsum.c,v 1.2 2015/12/13 18:38:23 christos Exp $ */
/*
* Calculate 32bit checksum of IPL and store in a certain location
@@ -54,9 +54,11 @@ main(int argc, char *argv[])
return 1;
}
if ((len = fread(bootblk, 1, sizeof bootblk, fp)) <= IPLOFF) {
+ fclose(fp);
fprintf(stderr, "%s: too short\n", argv[1]);
return 1;
} else if (len > BOOTSIZE) {
+ fclose(fp);
fprintf(stderr, "%s: too long (%d vs %d)\n", argv[1], len, BOOTSIZE);
return 1;
}
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: dholland
Date: Sun Aug 23 04:56:20 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs.h
Log Message:
Sync lfs changes with the x68k version of this code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/xxboot/readufs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/xxboot/readufs.h
diff -u src/sys/arch/hppa/stand/xxboot/readufs.h:1.2 src/sys/arch/hppa/stand/xxboot/readufs.h:1.3
--- src/sys/arch/hppa/stand/xxboot/readufs.h:1.2 Thu Aug 20 07:50:08 2015
+++ src/sys/arch/hppa/stand/xxboot/readufs.h Sun Aug 23 04:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $ */
+/* $NetBSD: readufs.h,v 1.3 2015/08/23 04:56:20 dholland Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -24,7 +24,6 @@ union ufs_dinode {
#endif
#ifdef USE_LFS
struct lfs32_dinode dil32;
- struct lfs64_dinode dil64;
#endif
};
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Thu Aug 20 07:50:08 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs.h readufs_lfs.c
Log Message:
minimal changes to get this to compile.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/readufs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/xxboot/readufs.h
diff -u src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 src/sys/arch/hppa/stand/xxboot/readufs.h:1.2
--- src/sys/arch/hppa/stand/xxboot/readufs.h:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/readufs.h Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $ */
/* from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
/*
@@ -23,8 +23,8 @@ union ufs_dinode {
struct ufs2_dinode di2;
#endif
#ifdef USE_LFS
- struct ulfs1_dinode dil1;
- struct ulfs2_dinode dil2;
+ struct lfs32_dinode dil32;
+ struct lfs64_dinode dil64;
#endif
};
Index: src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.3
--- src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2 Tue Jul 28 12:50:12 2015
+++ src/sys/arch/hppa/stand/xxboot/readufs_lfs.c Thu Aug 20 03:50:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.3 2015/08/20 07:50:08 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */
/*
@@ -20,7 +20,7 @@
#error LFS currently requires USE_UFS1
#endif
-static struct ulfs1_dinode ifile_dinode;
+static struct lfs32_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -156,7 +156,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
struct ufs_info *ufsinfo = &ufs_info;
daddr_t daddr;
char *buf = alloca(fsi.bsize);
- struct ulfs1_dinode *di, *diend;
+ struct lfs32_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -173,7 +173,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
i = ino % fsi_lfs.ifpb;
daddr = (fsi_lfs.version == 1) ?
((IFILE_V1 *) buf + i)->if_daddr
- : ((IFILE *) buf + i)->if_daddr;
+ : ((IFILE32 *) buf + i)->if_daddr;
}
#ifdef DEBUG_WITH_STDIO
printf("LFS(%d): daddr: %d\n", ino, (int) daddr);
@@ -186,7 +186,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
RAW_READ(buf, daddr << fsi.fsbtodb, fsi_lfs.ibsize);
/* Search for the inode. */
- di = (struct ulfs1_dinode *) buf;
+ di = (struct lfs32_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di < diend; di++)
@@ -210,7 +210,7 @@ found:
#endif
#endif
- dibuf->dil1 = *di;
+ dibuf->dil32 = *di;
return 0;
}
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: christos
Date: Tue Jul 28 16:50:12 UTC 2015
Modified Files:
src/sys/arch/hppa/stand/xxboot: readufs_lfs.c
Log Message:
fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/stand/xxboot/readufs_lfs.c
diff -u src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.1 src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.2
--- src/sys/arch/hppa/stand/xxboot/readufs_lfs.c:1.1 Mon Feb 24 02:23:43 2014
+++ src/sys/arch/hppa/stand/xxboot/readufs_lfs.c Tue Jul 28 12:50:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp */
/*
@@ -104,7 +104,7 @@ try_lfs(void)
if (sblk2.dlfs_magic == LFS_MAGIC) {
if (fsi_lfs.version == 1) {
-if (sblk.dlfs_otstamp > sblk2.dlfs_otstamp)
+if (sblk.dlfs_inopf > sblk2.dlfs_inopf)
s = &sblk2;
} else {
if (sblk.dlfs_serial > sblk2.dlfs_serial)
