Module Name: src Committed By: tsutsui Date: Sun Nov 16 13:38:39 UTC 2014
Modified Files: src/sys/arch/atari/stand/installboot: installboot.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/atari/stand/installboot/installboot.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/installboot/installboot.c diff -u src/sys/arch/atari/stand/installboot/installboot.c:1.30 src/sys/arch/atari/stand/installboot/installboot.c:1.31 --- src/sys/arch/atari/stand/installboot/installboot.c:1.30 Thu Nov 13 17:46:49 2014 +++ src/sys/arch/atari/stand/installboot/installboot.c Sun Nov 16 13:38:39 2014 @@ -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 @@ mkbootblock(struct bootblock *bb, char * struct disklabel *label, u_int magic) { int fd; - uint16_t sum; memset(bb, 0, sizeof(*bb)); @@ -499,10 +498,8 @@ mkbootblock(struct bootblock *bb, char * 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);