Wed Jun 8 16:04:40 2011 UTC ()
Use prototypes from libi386.h.


(joerg)
diff -r1.29 -r1.30 src/sys/arch/i386/stand/lib/pcio.c
cvs diff -r1.29 -r1.30 src/sys/arch/i386/stand/lib/pcio.c (expand / switch to unified diff)

--- src/sys/arch/i386/stand/lib/pcio.c 2011/02/14 23:47:11 1.29
+++ src/sys/arch/i386/stand/lib/pcio.c 2011/06/08 16:04:40 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pcio.c,v 1.29 2011/02/14 23:47:11 jmcneill Exp $ */ 1/* $NetBSD: pcio.c,v 1.30 2011/06/08 16:04:40 joerg Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996, 1997 4 * Copyright (c) 1996, 1997
5 * Matthias Drochner. All rights reserved. 5 * Matthias Drochner. 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.
@@ -28,30 +28,26 @@ @@ -28,30 +28,26 @@
28 28
29/* 29/*
30 * console I/O 30 * console I/O
31 * needs lowlevel routines from conio.S and comio.S 31 * needs lowlevel routines from conio.S and comio.S
32 */ 32 */
33 33
34#include <lib/libsa/stand.h> 34#include <lib/libsa/stand.h>
35#include <lib/libkern/libkern.h> 35#include <lib/libkern/libkern.h>
36#include <sys/bootblock.h> 36#include <sys/bootblock.h>
37 37
38#include "libi386.h" 38#include "libi386.h"
39#include "bootinfo.h" 39#include "bootinfo.h"
40 40
41extern void conputc(int); 
42extern int congetc(void); 
43extern int conisshift(void); 
44extern int coniskey(void); 
45extern struct x86_boot_params boot_params; 41extern struct x86_boot_params boot_params;
46 42
47struct btinfo_console btinfo_console; 43struct btinfo_console btinfo_console;
48 44
49#ifdef SUPPORT_SERIAL 45#ifdef SUPPORT_SERIAL
50static int iodev; 46static int iodev;
51 47
52#ifdef DIRECT_SERIAL 48#ifdef DIRECT_SERIAL
53#include "comio_direct.h" 49#include "comio_direct.h"
54 50
55#define cominit_x() btinfo_console.speed = \ 51#define cominit_x() btinfo_console.speed = \
56 cominit_d(btinfo_console.addr, btinfo_console.speed) 52 cominit_d(btinfo_console.addr, btinfo_console.speed)
57#define computc_x(ch) computc_d(ch, btinfo_console.addr) 53#define computc_x(ch) computc_d(ch, btinfo_console.addr)