Tue Mar 17 00:18:40 2009 UTC ()
Make a couple of functions conform to the prototype, restoring buildability.


(he)
diff -r1.5 -r1.6 src/sys/arch/atari/stand/bootpref/bootpref.c
diff -r1.7 -r1.8 src/sys/arch/atari/stand/libsa/diskio.c
cvs diff -r1.5 -r1.6 src/sys/arch/atari/stand/bootpref/bootpref.c (expand / switch to unified diff)

--- src/sys/arch/atari/stand/bootpref/bootpref.c 2009/03/14 21:04:07 1.5
+++ src/sys/arch/atari/stand/bootpref/bootpref.c 2009/03/17 00:18:40 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bootpref.c,v 1.5 2009/03/14 21:04:07 dsl Exp $ */ 1/* $NetBSD: bootpref.c,v 1.6 2009/03/17 00:18:40 he Exp $ */
2/*- 2/*-
3 * Copyright (c) 1998 The NetBSD Foundation, Inc. 3 * Copyright (c) 1998 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Julian Coleman. 7 * by Julian Coleman.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -369,27 +369,27 @@ getNVpref (int fd, u_char bootpref[]) @@ -369,27 +369,27 @@ getNVpref (int fd, u_char bootpref[])
369 /* Date format/separator */ 369 /* Date format/separator */
370 printf ("Date format is "); 370 printf ("Date format is ");
371 showDateFmt (readNVRAM (fd, NVRAM_DATIME)); 371 showDateFmt (readNVRAM (fd, NVRAM_DATIME));
372 printf ("Date separator is "); 372 printf ("Date separator is ");
373 showDateSep (readNVRAM (fd, NVRAM_DATESEP)); 373 showDateSep (readNVRAM (fd, NVRAM_DATESEP));
374 /* Video */ 374 /* Video */
375 printf ("Video is (0x%02x, 0x%02x) :\n", readNVRAM (fd, NVRAM_VID2), 375 printf ("Video is (0x%02x, 0x%02x) :\n", readNVRAM (fd, NVRAM_VID2),
376 readNVRAM (fd, NVRAM_VID1)); 376 readNVRAM (fd, NVRAM_VID1));
377 showVideo2 (readNVRAM (fd, NVRAM_VID2)); 377 showVideo2 (readNVRAM (fd, NVRAM_VID2));
378 showVideo1 (readNVRAM (fd, NVRAM_VID1), readNVRAM (fd, NVRAM_VID2)); 378 showVideo1 (readNVRAM (fd, NVRAM_VID1), readNVRAM (fd, NVRAM_VID2));
379} 379}
380 380
381static void 381static void
382setNVpref (int fd, u_char bootpref[], set, int verbose) 382setNVpref (int fd, u_char bootpref[], int set, int verbose)
383{ 383{
384 /* Boot OS */ 384 /* Boot OS */
385 if (set & SET_OS) { 385 if (set & SET_OS) {
386 writeNVRAM (fd, NVRAM_BOOTPREF, bootpref[ARRAY_OS]); 386 writeNVRAM (fd, NVRAM_BOOTPREF, bootpref[ARRAY_OS]);
387 if (verbose) { 387 if (verbose) {
388 printf ("Boot OS set to "); 388 printf ("Boot OS set to ");
389 showOS (readNVRAM (fd, NVRAM_BOOTPREF)); 389 showOS (readNVRAM (fd, NVRAM_BOOTPREF));
390 } 390 }
391 } 391 }
392 /* Boot Delay */ 392 /* Boot Delay */
393 if (set & SET_BOOTDLY) { 393 if (set & SET_BOOTDLY) {
394 writeNVRAM (fd, NVRAM_BOOTDLY, bootpref[ARRAY_BOOTDLY]); 394 writeNVRAM (fd, NVRAM_BOOTDLY, bootpref[ARRAY_BOOTDLY]);
395 if (verbose) { 395 if (verbose) {
cvs diff -r1.7 -r1.8 src/sys/arch/atari/stand/libsa/diskio.c (expand / switch to unified diff)

--- src/sys/arch/atari/stand/libsa/diskio.c 2009/03/14 21:04:07 1.7
+++ src/sys/arch/atari/stand/libsa/diskio.c 2009/03/17 00:18:40 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: diskio.c,v 1.7 2009/03/14 21:04:07 dsl Exp $ */ 1/* $NetBSD: diskio.c,v 1.8 2009/03/17 00:18:40 he Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1995 Waldi Ravens. 4 * Copyright (c) 1995 Waldi Ravens.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -95,27 +95,27 @@ rootstrategy (void *devd, int flag, dadd @@ -95,27 +95,27 @@ rootstrategy (void *devd, int flag, dadd
95 size_t nb = size >> 9; 95 size_t nb = size >> 9;
96 96
97 if ((flag == F_READ) && !(size & 511) && (stb + nb <= dd->rend)) { 97 if ((flag == F_READ) && !(size & 511) && (stb + nb <= dd->rend)) {
98 if (!dd->rds(buf, stb, nb)) { 98 if (!dd->rds(buf, stb, nb)) {
99 *rsize = size; 99 *rsize = size;
100 return(0); 100 return(0);
101 } 101 }
102 } 102 }
103 *rsize = 0; 103 *rsize = 0;
104 return(EIO); 104 return(EIO);
105} 105}
106 106
107static int 107static int
108rootopen (struct open_file *f) 108rootopen (struct open_file *f, ...)
109{ 109{
110 return(0); 110 return(0);
111} 111}
112 112
113static int 113static int
114rootclose (struct open_file *f) 114rootclose (struct open_file *f)
115{ 115{
116 return(EIO); 116 return(EIO);
117} 117}
118 118
119static int 119static int
120rootioctl (struct open_file *f, u_long cmd, void *data) 120rootioctl (struct open_file *f, u_long cmd, void *data)
121{ 121{