Module Name: src
Committed By: martin
Date: Sun Dec 14 14:21:21 UTC 2014
Modified Files:
src/sys/arch/atari/stand/bootxx [netbsd-6]: bootxx.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1211):
sys/arch/atari/stand/bootxx/bootxx.c: revision 1.16
Expand heap to 64KB so that bootxx can load bootxxx from 32KB blocksize ffs.
Tested on TT030 with 32GB SSD via SATA->IDE->SCSI converters.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.18.1 src/sys/arch/atari/stand/bootxx/bootxx.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/atari/stand/bootxx/bootxx.c
diff -u src/sys/arch/atari/stand/bootxx/bootxx.c:1.15 src/sys/arch/atari/stand/bootxx/bootxx.c:1.15.18.1
--- src/sys/arch/atari/stand/bootxx/bootxx.c:1.15 Mon Aug 24 13:04:37 2009
+++ src/sys/arch/atari/stand/bootxx/bootxx.c Sun Dec 14 14:21:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.15 2009/08/24 13:04:37 tsutsui Exp $ */
+/* $NetBSD: bootxx.c,v 1.15.18.1 2014/12/14 14:21:21 martin Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens.
@@ -49,6 +49,11 @@ int bootxxx(void *, void *, struct osdsc
int load_booter(struct osdsc *);
int usr_info(struct osdsc *);
+#define BOOTXXX_MAXSIZE (64 * 1024)
+#define HEAPSIZE (64 * 1024) /* should be >32KB for ffs blocksize */
+#define HEAPSTART (LOADADDR3 + BOOTXXX_MAXSIZE)
+#define HEAPEND (HEAPSTART + HEAPSIZE)
+
int
bootxx(void *readsector, void *disklabel, int autoboot)
{
@@ -58,10 +63,10 @@ bootxx(void *readsector, void *disklabel
bxxx_t bootxxx = (bxxx_t)(LOADADDR3);
memset(edata, 0, end - edata);
- setheap(end, (void*)(LOADADDR3 - 4));
+ setheap((void *)HEAPSTART, (void *)HEAPEND);
printf("\033v\nNetBSD/atari secondary bootloader"
- " ($Revision: 1.15 $)\n\n");
+ " ($Revision: 1.15.18.1 $)\n\n");
if (init_dskio(readsector, disklabel, -1))
return -1;
