Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/atari/stand/bootxx Expand heap to 64KB so that boot...



details:   https://anonhg.NetBSD.org/src/rev/428cd865c0c0
branches:  trunk
changeset: 333725:428cd865c0c0
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Nov 15 06:30:10 2014 +0000

description:
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.
Should be pulled up to netbsd-7 and netbsd-6 branches..

diffstat:

 sys/arch/atari/stand/bootxx/bootxx.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 48ea8a1e876d -r 428cd865c0c0 sys/arch/atari/stand/bootxx/bootxx.c
--- a/sys/arch/atari/stand/bootxx/bootxx.c      Sat Nov 15 05:03:55 2014 +0000
+++ b/sys/arch/atari/stand/bootxx/bootxx.c      Sat Nov 15 06:30:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxx.c,v 1.15 2009/08/24 13:04:37 tsutsui Exp $      */
+/*     $NetBSD: bootxx.c,v 1.16 2014/11/15 06:30:10 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1995 Waldi Ravens.
@@ -49,6 +49,11 @@
 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 @@
        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.16 $)\n\n");
 
        if (init_dskio(readsector, disklabel, -1))
                return -1;



Home | Main Index | Thread Index | Old Index