[src/trunk]: src/sys/arch/arm26/stand/boot26 Add copyright notices. Use MEMC...

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/13844c3091b2
branches:  trunk
changeset: 513328:13844c3091b2
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Jul 28 13:49:25 2001 +0000

description:
Add copyright notices.  Use MEMC_PHYS_BASE rather than 0x02000000.

diffstat:

 sys/arch/arm26/stand/boot26/boot26.c |  46 ++++++++++++++++++++++++++++-------
 sys/arch/arm26/stand/boot26/start.S  |  31 ++++++++++++++++++++++-
 sys/arch/arm26/stand/boot26/version  |   5 ++-
 3 files changed, 69 insertions(+), 13 deletions(-)

diffs (147 lines):

diff -r e01bc399cb86 -r 13844c3091b2 sys/arch/arm26/stand/boot26/boot26.c
--- a/sys/arch/arm26/stand/boot26/boot26.c      Sat Jul 28 13:48:32 2001 +0000
+++ b/sys/arch/arm26/stand/boot26/boot26.c      Sat Jul 28 13:49:25 2001 +0000
@@ -1,10 +1,38 @@
-/*     $NetBSD: boot26.c,v 1.1 2001/07/27 23:13:50 bjh21 Exp $ */
+/*     $NetBSD: boot26.c,v 1.2 2001/07/28 13:49:25 bjh21 Exp $ */
+
+/*-
+ * Copyright (c) 1998, 1999, 2000, 2001 Ben Harris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/loadfile.h>
 #include <riscoscalls.h>
 #include <sys/boot_flag.h>
 #include <machine/boot.h>
+#include <machine/memcreg.h>
 
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
@@ -92,16 +120,16 @@
        bootconfig.version = 0;
        bootconfig.boothowto = howto;
        bootconfig.bootdev = -1;
-       bootconfig.ssym = marks[MARK_SYM] - 0x02000000;
-       bootconfig.esym = marks[MARK_END] - 0x02000000;
+       bootconfig.ssym = (caddr_t)marks[MARK_SYM] - MEMC_PHYS_BASE;
+       bootconfig.esym = (caddr_t)marks[MARK_END] - MEMC_PHYS_BASE;
        bootconfig.nbpp = nbpp;
        bootconfig.npages = npages;
-       bootconfig.freebase = marks[MARK_END] - 0x02000000;
+       bootconfig.freebase = (caddr_t)marks[MARK_END] - MEMC_PHYS_BASE;
        bootconfig.xpixels = vdu_var(os_MODEVAR_XWIND_LIMIT) + 1;
        bootconfig.ypixels = vdu_var(os_MODEVAR_YWIND_LIMIT) + 1;
        bootconfig.bpp = 1 << vdu_var(os_MODEVAR_LOG2_BPP);
-       bootconfig.screenbase = vdu_var(os_VDUVAR_DISPLAY_START) +
-           vdu_var(os_VDUVAR_TOTAL_SCREEN_SIZE) - 0x02000000;
+       bootconfig.screenbase = (caddr_t)vdu_var(os_VDUVAR_DISPLAY_START) +
+           vdu_var(os_VDUVAR_TOTAL_SCREEN_SIZE) - MEMC_PHYS_BASE;
        bootconfig.screensize = vdu_var(os_VDUVAR_TOTAL_SCREEN_SIZE);
        os_byte(osbyte_OUTPUT_CURSOR_POSITION, 0, 0, NULL, &crow);
        bootconfig.cpixelrow = crow * vdu_var(os_VDUVAR_TCHAR_SPACEY);
@@ -190,7 +218,7 @@
 
        total = 0;
        while (size > 0) {
-               ppn = ((u_int)addr - 0x02000000) / nbpp;
+               ppn = ((caddr_t)addr - MEMC_PHYS_BASE) / nbpp;
                if (pgstatus[ppn] != FREE)
                        panic("Page %d not free", ppn);
                fragaddr = pginfo[ppn].map + ((u_int)addr % nbpp);
@@ -218,7 +246,7 @@
        void *addr = dst;
 
        while (size > 0) {
-               ppn = ((u_int)addr - 0x02000000) / nbpp;
+               ppn = ((caddr_t)addr - MEMC_PHYS_BASE) / nbpp;
                if (pgstatus[ppn] != FREE)
                        panic("Page %d not free", ppn);
                fragaddr = pginfo[ppn].map + ((u_int)addr % nbpp);
@@ -242,7 +270,7 @@
        void *addr = dst;
 
        while (size > 0) {
-               ppn = ((u_int)addr - 0x02000000) / nbpp;
+               ppn = ((caddr_t)addr - MEMC_PHYS_BASE) / nbpp;
                if (pgstatus[ppn] != FREE)
                        panic("Page %d not free", ppn);
                fragaddr = pginfo[ppn].map + ((u_int)addr % nbpp);
diff -r e01bc399cb86 -r 13844c3091b2 sys/arch/arm26/stand/boot26/start.S
--- a/sys/arch/arm26/stand/boot26/start.S       Sat Jul 28 13:48:32 2001 +0000
+++ b/sys/arch/arm26/stand/boot26/start.S       Sat Jul 28 13:49:25 2001 +0000
@@ -1,4 +1,31 @@
-/*     $NetBSD: start.S,v 1.1 2001/07/27 23:13:50 bjh21 Exp $  */
+/*     $NetBSD: start.S,v 1.2 2001/07/28 13:49:25 bjh21 Exp $  */
+
+/*-
+ * Copyright (c) 2001 Ben Harris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <machine/asm.h>
 #include <riscoscalls.h>
@@ -7,4 +34,4 @@
        swi     OS_EnterOS
        mov     sp, r2          /* Set up initial kernel stack */
        mov     fp, #0          /* of which this is the top. */
-       mov     pc, r1          /* GO! */
\ No newline at end of file
+       mov     pc, r1          /* GO! */
diff -r e01bc399cb86 -r 13844c3091b2 sys/arch/arm26/stand/boot26/version
--- a/sys/arch/arm26/stand/boot26/version       Sat Jul 28 13:48:32 2001 +0000
+++ b/sys/arch/arm26/stand/boot26/version       Sat Jul 28 13:49:25 2001 +0000
@@ -1,3 +1,4 @@
-       $NetBSD: version,v 1.1 2001/07/27 23:13:50 bjh21 Exp $
+       $NetBSD: version,v 1.2 2001/07/28 13:49:25 bjh21 Exp $
 
-0.90:  Experimental C version
\ No newline at end of file
+0.90:  Experimental C version
+0.91:  General cleanup
\ No newline at end of file