Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst defs.h:
details: https://anonhg.NetBSD.org/src/rev/32213858ebcc
branches: trunk
changeset: 747538:32213858ebcc
user: abs <abs%NetBSD.org@localhost>
date: Sat Sep 19 14:57:27 2009 +0000
description:
defs.h:
- Re-order the md_*() definitions so they are in the order called
- Add some comments
- Remove obsolete md_set_no_x() definition
- Remove md_copy_filesystem()
- #if defined(DEBUG) declare backtowin(void) to avoid scattering
externs in various md .c files
mbr.[ch]:
- Add a set_bios_geom_with_mbr_guess() which can be called by all
the non x86 ports rather than copying the same code into arc,
bebox, cobalt, evbmips, evbppc, hpcarm, hpcmips, landisk, ofppc,
prep, sandpoint, and zaurus md.c
install.c:
- Remove now unnecessary call to md_copy_filesystem()
upgrade.c:
- Move move_aout_libs() here, and put under #ifdef AOUT2ELF
- Rather than having *every* md_update call wrefresh(curscr),
wmove(stdscr, 0, 0), wclear(stdscr), and wrefresh(stdscr),
move them here
arch/acorn26/md.c:
- Just include arch/acorn32/md.c, but add a note there warning
about this, and while here add a note to i386/md.c that it
is included by amd64
arch/*/md.c:
- By all means "Vive la difference", but we have 38 pairs of md.[ch],
and they could not even agree on the order in which to list the
md hooks, let alone formatting. Sort the md hooks to match the
(now sane) order in def.sh, and try to normalise the formatting
- Also copy across some function level comments everywhere
- Ensure functions only used inside each md.c are defined as static
- Remove some now unused functions
- Some files had enable_rc_conf in #ifdef DEBUG. Add this to all
- bebox, evbppc and sandpoint were still playing broken games with
copying the booted ramdisk to the target disk, the primary result
of which was just to slow things down and ensure the target system
lost the .profile extracted from the sets. Just kill this.
- For some ports md_update() called endwin(), and in others not.
Take a cure from i386/amd64 and a few other more active ports,
and update everything to match (no endwin())
- In a couple of cases correct port names in comments
- ANSIfy some lingering old style functions
- Consistently use "return 0;" rather than "return (0);"
More of the mbr code should be abstracted, along with the
get_ramsize() / set_swap() logic, but this is (more than)
enough for one day...
sysinst built for all ports but only runtime tested on amd64 & i386
diffstat:
distrib/utils/sysinst/arch/acorn26/md.c | 358 +---------
distrib/utils/sysinst/arch/acorn32/md.c | 241 +++---
distrib/utils/sysinst/arch/alpha/md.c | 94 +-
distrib/utils/sysinst/arch/amiga/md.c | 111 +-
distrib/utils/sysinst/arch/arc/md.c | 191 ++---
distrib/utils/sysinst/arch/atari/md.c | 141 +--
distrib/utils/sysinst/arch/bebox/md.c | 142 +--
distrib/utils/sysinst/arch/cats/md.c | 112 +-
distrib/utils/sysinst/arch/cobalt/md.c | 224 ++---
distrib/utils/sysinst/arch/evbarm/md.c | 100 +-
distrib/utils/sysinst/arch/evbmips/md.c | 136 +--
distrib/utils/sysinst/arch/evbppc/md.c | 151 +--
distrib/utils/sysinst/arch/ews4800mips/md.c | 128 +-
distrib/utils/sysinst/arch/ews4800mips/md.h | 7 +-
distrib/utils/sysinst/arch/hp300/md.c | 143 +--
distrib/utils/sysinst/arch/hp300/md.h | 5 +-
distrib/utils/sysinst/arch/hp700/md.c | 92 +-
distrib/utils/sysinst/arch/hpcarm/md.c | 125 +-
distrib/utils/sysinst/arch/hpcmips/md.c | 124 +-
distrib/utils/sysinst/arch/i386/md.c | 332 ++++----
distrib/utils/sysinst/arch/landisk/md.c | 158 +--
distrib/utils/sysinst/arch/mac68k/md.c | 975 +++++++++++++-------------
distrib/utils/sysinst/arch/mac68k/md.h | 27 +-
distrib/utils/sysinst/arch/macppc/md.c | 98 +-
distrib/utils/sysinst/arch/mipsco/md.c | 107 +-
distrib/utils/sysinst/arch/mvme68k/md.c | 167 +--
distrib/utils/sysinst/arch/news68k/md.c | 117 +--
distrib/utils/sysinst/arch/newsmips/md.c | 112 +-
distrib/utils/sysinst/arch/ofppc/md.c | 755 ++++++++++----------
distrib/utils/sysinst/arch/playstation2/md.c | 160 ++--
distrib/utils/sysinst/arch/pmax/md.c | 104 +-
distrib/utils/sysinst/arch/prep/md.c | 368 ++++-----
distrib/utils/sysinst/arch/sandpoint/md.c | 144 +--
distrib/utils/sysinst/arch/sgimips/md.c | 135 +-
distrib/utils/sysinst/arch/shark/md.c | 146 ++-
distrib/utils/sysinst/arch/sparc/md.c | 95 +-
distrib/utils/sysinst/arch/sparc64/md.c | 109 +-
distrib/utils/sysinst/arch/vax/md.c | 96 +-
distrib/utils/sysinst/arch/x68k/md.c | 169 ++--
distrib/utils/sysinst/arch/zaurus/md.c | 233 ++---
distrib/utils/sysinst/defs.h | 24 +-
distrib/utils/sysinst/install.c | 5 +-
distrib/utils/sysinst/mbr.c | 19 +-
distrib/utils/sysinst/mbr.h | 4 +-
distrib/utils/sysinst/target.c | 6 +-
distrib/utils/sysinst/upgrade.c | 10 +-
46 files changed, 3212 insertions(+), 4088 deletions(-)
diffs (truncated from 10068 to 300 lines):
diff -r 22c051f41c29 -r 32213858ebcc distrib/utils/sysinst/arch/acorn26/md.c
--- a/distrib/utils/sysinst/arch/acorn26/md.c Sat Sep 19 14:54:17 2009 +0000
+++ b/distrib/utils/sysinst/arch/acorn26/md.c Sat Sep 19 14:57:27 2009 +0000
@@ -1,357 +1,5 @@
-/* $NetBSD: md.c,v 1.22 2008/10/07 09:58:14 abs Exp $ */
-
-/*
- * Copyright 1997 Piermont Information Systems Inc.
- * All rights reserved.
- *
- * Based on code written by Philip A. Nelson for Piermont Information
- * Systems Inc.
- *
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Piermont Information Systems Inc.
- * 4. The name of Piermont Information Systems Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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.
- *
- */
-
-/* md.c -- acorn26 machine specific routines */
-
-#include <stdio.h>
-#include <curses.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <util.h>
-#include <sys/types.h>
-#include <sys/disklabel.h>
-#include <sys/disklabel_acorn.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include "defs.h"
-#include "md.h"
-#include "msg_defs.h"
-#include "menu_defs.h"
-void backtowin(void);
-
-static int
-filecore_checksum(u_char *bootblock);
-
-/*
- * static int filecore_checksum(u_char *bootblock)
- *
- * Calculates the filecore boot block checksum. This is used to validate
- * a filecore boot block on the disk. If a boot block is validated then
- * it is used to locate the partition table. If the boot block is not
- * validated, it is assumed that the whole disk is NetBSD.
- *
- * The basic algorithm is:
- *
- * for (each byte in block, excluding checksum) {
- * sum += byte;
- * if (sum > 255)
- * sum -= 255;
- * }
- *
- * That's equivalent to summing all of the bytes in the block
- * (excluding the checksum byte, of course), then calculating the
- * checksum as "cksum = sum - ((sum - 1) / 255) * 255)". That
- * expression may or may not yield a faster checksum function,
- * but it's easier to reason about.
- *
- * Note that if you have a block filled with bytes of a single
- * value "X" (regardless of that value!) and calculate the cksum
- * of the block (excluding the checksum byte), you will _always_
- * end up with a checksum of X. (Do the math; that can be derived
- * from the checksum calculation function!) That means that
- * blocks which contain bytes which all have the same value will
- * always checksum properly. That's a _very_ unlikely occurence
- * (probably impossible, actually) for a valid filecore boot block,
- * so we treat such blocks as invalid.
- */
-
-static int
-filecore_checksum(u_char *bootblock)
-{
- u_char byte0, accum_diff;
- u_int sum;
- int i;
-
- sum = 0;
- accum_diff = 0;
- byte0 = bootblock[0];
-
- /*
- * Sum the contents of the block, keeping track of whether
- * or not all bytes are the same. If 'accum_diff' ends up
- * being zero, all of the bytes are, in fact, the same.
- */
- for (i = 0; i < 511; ++i) {
- sum += bootblock[i];
- accum_diff |= bootblock[i] ^ byte0;
- }
-
- /*
- * Check to see if the checksum byte is the same as the
- * rest of the bytes, too. (Note that if all of the bytes
- * are the same except the checksum, a checksum compare
- * won't succeed, but that's not our problem.)
- */
- accum_diff |= bootblock[i] ^ byte0;
-
- /* All bytes in block are the same; call it invalid. */
- if (accum_diff == 0)
- return (-1);
-
- return (sum - ((sum - 1) / 255) * 255);
-}
-
-int
-md_get_info(void)
-{
- struct disklabel disklabel;
- int fd;
- char dev_name[100];
- static unsigned char bb[DEV_BSIZE];
- struct filecore_bootblock *fcbb = (struct filecore_bootblock *)bb;
- int offset = 0;
-
- if (strncmp(diskdev, "wd", 2) == 0)
- disktype = "ST506";
- else
- disktype = "SCSI";
-
- snprintf(dev_name, 100, "/dev/r%s%c", diskdev, 'a' + getrawpartition());
-
- fd = open(dev_name, O_RDONLY, 0);
- if (fd < 0) {
- endwin();
- fprintf(stderr, "Can't open %s\n", dev_name);
- exit(1);
- }
- if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- endwin();
- fprintf(stderr, "Can't read disklabel on %s.\n", dev_name);
- close(fd);
- exit(1);
- }
-
- if (lseek(fd, (off_t)FILECORE_BOOT_SECTOR * DEV_BSIZE, SEEK_SET) < 0
- || read(fd, bb, sizeof(bb)) < sizeof(bb)) {
- endwin();
- fprintf(stderr, msg_string(MSG_badreadbb));
- close(fd);
- exit(1);
- }
-
- /* Check if table is valid. */
- if (filecore_checksum(bb) == fcbb->checksum) {
- /*
- * Check for NetBSD/arm32 (RiscBSD) partition marker.
- * If found the NetBSD disklabel location is easy.
- */
-
- offset = (fcbb->partition_cyl_low +
- (fcbb->partition_cyl_high << 8)) *
- fcbb->heads * fcbb->secspertrack;
+/* $NetBSD: md.c,v 1.23 2009/09/19 14:57:27 abs Exp $ */
- if (fcbb->partition_type == PARTITION_FORMAT_RISCBSD)
- ;
- else if (fcbb->partition_type == PARTITION_FORMAT_RISCIX) {
- /*
- * Ok we need to read the RISCiX partition table and
- * search for a partition named RiscBSD, NetBSD or
- * Empty:
- */
-
- struct riscix_partition_table *riscix_part =
- (struct riscix_partition_table *)bb;
- struct riscix_partition *part;
- int loop;
-
- if (lseek(fd, (off_t)offset * DEV_BSIZE, SEEK_SET) < 0
- || read(fd, bb, sizeof(bb)) < sizeof(bb)) {
- endwin();
- fprintf(stderr, msg_string(MSG_badreadriscix));
- close(fd);
- exit(1);
- }
-
- /* Break out as soon as we find a suitable partition */
- for (loop = 0; loop < NRISCIX_PARTITIONS; ++loop) {
- part = &riscix_part->partitions[loop];
- if (strcmp((char *)part->rp_name, "RiscBSD") == 0
- || strcmp((char *)part->rp_name, "NetBSD") == 0
- || strcmp((char *)part->rp_name, "Empty:") == 0) {
- offset = part->rp_start;
- break;
- }
- }
- if (loop == NRISCIX_PARTITIONS) {
- /*
- * Valid filecore boot block, RISCiX partition
- * table but no NetBSD partition. We should
- * leave this disc alone.
- */
- endwin();
- fprintf(stderr, msg_string(MSG_notnetbsdriscix));
- close(fd);
- exit(1);
- }
- } else {
- /*
- * Valid filecore boot block and no non-ADFS partition.
- * This means that the whole disc is allocated for ADFS
- * so do not trash ! If the user really wants to put a
- * NetBSD disklabel on the disc then they should remove
- * the filecore boot block first with dd.
- */
- endwin();
- fprintf(stderr, msg_string(MSG_notnetbsd));
- close(fd);
- exit(1);
- }
- }
- close(fd);
-
- dlcyl = disklabel.d_ncylinders;
- dlhead = disklabel.d_ntracks;
- dlsec = disklabel.d_nsectors;
- sectorsize = disklabel.d_secsize;
- dlcylsize = disklabel.d_secpercyl;
-
- /*
- * Compute whole disk size. Take max of (dlcyl*dlhead*dlsec)
- * and secperunit, just in case the disk is already labelled.
- * (If our new label's RAW_PART size ends up smaller than the
- * in-core RAW_PART size value, updating the label will fail.)
- */
- dlsize = dlcyl*dlhead*dlsec;
- if (disklabel.d_secperunit > dlsize)
- dlsize = disklabel.d_secperunit;
-
- ptstart = offset;
-/* endwin();
- printf("dlcyl=%d\n", dlcyl);
- printf("dlhead=%d\n", dlhead);
- printf("dlsec=%d\n", dlsec);
- printf("secsz=%d\n", sectorsize);
- printf("cylsz=%d\n", dlcylsize);
- printf("dlsz=%d\n", dlsize);
- printf("pstart=%d\n", ptstart);
- printf("pstart=%d\n", partsize);
- printf("secpun=%d\n", disklabel.d_secperunit);
- backtowin();*/
+/* md.c -- Machine specific code for acorn26 */
- return 1;
-}
-
-int
-md_pre_disklabel(void)
-{
- return 0;
-}
-
-int
-md_post_disklabel(void)
-{
- return 0;
-}
-
-int
-md_post_newfs(void)
-{
-#if 0
- /* XXX boot blocks ... */
- printf(msg_string(MSG_dobootblks), diskdev);
- run_program(RUN_DISPLAY, "/sbin/disklabel -B %s /dev/r%sc",
- "-b /usr/mdec/rzboot -s /usr/mdec/bootrz", diskdev);
-#endif
- return 0;
-}
-
-int
Home |
Main Index |
Thread Index |
Old Index