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/installboot Revert revs 1.29 and 1.30, ...
details: https://anonhg.NetBSD.org/src/rev/d128a0aed03c
branches: trunk
changeset: 333779:d128a0aed03c
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sun Nov 16 13:38:39 2014 +0000
description:
Revert revs 1.29 and 1.30, to make it easier to pullup an alternative fix.
Ok'ed by christos@
http://mail-index.netbsd.org/source-changes-d/2014/11/15/msg007338.html
diffstat:
sys/arch/atari/stand/installboot/installboot.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diffs (30 lines):
diff -r c5e3708fde50 -r d128a0aed03c sys/arch/atari/stand/installboot/installboot.c
--- a/sys/arch/atari/stand/installboot/installboot.c Sun Nov 16 12:02:55 2014 +0000
+++ b/sys/arch/atari/stand/installboot/installboot.c Sun Nov 16 13:38:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.30 2014/11/13 17:46:49 christos Exp $ */
+/* $NetBSD: installboot.c,v 1.31 2014/11/16 13:38:39 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -467,7 +467,6 @@
struct disklabel *label, u_int magic)
{
int fd;
- uint16_t sum;
memset(bb, 0, sizeof(*bb));
@@ -499,10 +498,8 @@
setIDEpar(bb->bb_xxboot, sizeof(bb->bb_xxboot));
/* set AHDI checksum */
- sum = 0;
- memcpy(bb->bb_xxboot + 255 * sizeof(sum), &sum, sizeof(sum));
- sum = 0x1234 - abcksum(bb->bb_xxboot);
- memcpy(bb->bb_xxboot + 255 * sizeof(sum), &sum, sizeof(sum));
+ *((u_int16_t *)bb->bb_xxboot + 255) = 0;
+ *((u_int16_t *)bb->bb_xxboot + 255) = 0x1234 - abcksum(bb->bb_xxboot);
if (verbose) {
printf("Primary boot loader: %s\n", xxb);
Home |
Main Index |
Thread Index |
Old Index