Module Name: src
Committed By: tsutsui
Date: Sun Jun 26 14:14:47 UTC 2022
Modified Files:
src/sys/arch/atari/stand/bootxxx: bootxxx.c
src/sys/arch/atari/stand/xxboot/ahdi-sdb00t: sdb00t.ahdi.S
src/sys/arch/atari/stand/xxboot/ahdi-wdb00t: wdb00t.ahdi.S
src/sys/arch/atari/stand/xxboot/ahdi-xxboot: xxboot.ahdi.S
src/sys/arch/atari/stand/xxboot/fdboot: fdboot.S
src/sys/arch/atari/stand/xxboot/sdboot: sdboot.S
src/sys/arch/atari/stand/xxboot/wdboot: wdboot.S
Log Message:
Unifdef __ELF__.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/stand/bootxxx/bootxxx.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S
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/atari/stand/bootxxx/bootxxx.c
diff -u src/sys/arch/atari/stand/bootxxx/bootxxx.c:1.9 src/sys/arch/atari/stand/bootxxx/bootxxx.c:1.10
--- src/sys/arch/atari/stand/bootxxx/bootxxx.c:1.9 Sun Jun 26 14:08:15 2022
+++ src/sys/arch/atari/stand/bootxxx/bootxxx.c Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxxx.c,v 1.9 2022/06/26 14:08:15 tsutsui Exp $ */
+/* $NetBSD: bootxxx.c,v 1.10 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 2001 Leo Weppelman.
@@ -58,7 +58,7 @@ bootxxx(void *readsector, void *disklabe
/* XXX: Limit should be 16MB */
setheap(end, (void*)0x1000000);
printf("\033v\nNetBSD/atari tertiary bootloader "
- "($Revision: 1.9 $)\n\n");
+ "($Revision: 1.10 $)\n\n");
if (init_dskio(readsector, disklabel, od->rootfs))
return -1;
@@ -74,11 +74,7 @@ bootxxx(void *readsector, void *disklabe
return -3;
}
-#ifndef __ELF__ /* a.out */
- if (aout_load(fd, od, &errmsg, 1) != 0)
-#else
if (elf_load(fd, od, &errmsg, 1) != 0)
-#endif
return -4;
boot_BSD(&od->kp);
Index: src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S
diff -u src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S:1.2 src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S:1.3
--- src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdb00t.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: sdb00t.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -32,19 +32,11 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start: bras main
-#else
- .globl start, main, fill
-
- .text
-
-start: bras main
-#endif
bra rds0
main: bclr #2,(_drvbits+3):w
Index: src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S
diff -u src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S:1.2 src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S:1.3
--- src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wdb00t.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: wdb00t.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -32,19 +32,11 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start: bras main
-#else
- .globl start, main, fill
-
- .text
-
-start: bras main
-#endif
bra rds0
main: bclr #2,(_drvbits+3):w
Index: src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S
diff -u src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S:1.2 src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S:1.3
--- src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xxboot.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: xxboot.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens.
@@ -32,19 +32,11 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start: bras main
-#else
- .globl start, main, fill
-
- .text
-
-start: bras main
-#endif
/*
* Fake gemdos-fs bootsector, to keep TOS away.
*/
Index: src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S
diff -u src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S:1.2 src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S:1.3
--- src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/fdboot/fdboot.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: fdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens.
@@ -32,19 +32,11 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start: bras main
-#else
- .globl start, main, fill
-
- .text
-
-start: bras main
-#endif
/*
* Fake gemdos-fs bootsector, to keep TOS away.
*/
Index: src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S
diff -u src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S:1.2 src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S:1.3
--- src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/sdboot/sdboot.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: sdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -32,17 +32,10 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start:
-#else
- .globl start, main, fill
-
- .text
-start:
-#endif
/*
* in: d3 ('DMAr' flag), d4 (SCSI target), d5 (boot pref), d7 (ACSI target)
*/
Index: src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S
diff -u src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S:1.2 src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S:1.3
--- src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S:1.2 Sun Dec 11 12:17:02 2005
+++ src/sys/arch/atari/stand/xxboot/wdboot/wdboot.S Sun Jun 26 14:14:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/* $NetBSD: wdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -32,17 +32,10 @@
#include "xxboot.h"
-#ifdef __ELF__
.globl _start, main, fill
.text
_start:
-#else
- .globl start, main, fill
-
- .text
-start:
-#endif
/*
* in: d3 ('DMAr' flag), d4 (SCSI target), d5 (boot pref), d7 (ACSI target)
*/
