summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/apm/apm.c4
-rw-r--r--sys/i386/bios/apm.c4
-rw-r--r--sys/i386/eisa/eisaconf.c8
-rw-r--r--sys/i386/eisa/if_vx_eisa.c2
-rw-r--r--sys/i386/i386/bios.c8
-rw-r--r--sys/i386/i386/mp_machdep.c12
-rw-r--r--sys/i386/i386/mptable.c12
-rw-r--r--sys/i386/i386/pmap.c30
-rw-r--r--sys/i386/i386/sys_machdep.c4
-rw-r--r--sys/i386/i386/tsc.c4
-rw-r--r--sys/i386/ibcs2/imgact_coff.c12
-rw-r--r--sys/i386/include/mptable.h12
-rw-r--r--sys/i386/isa/aic6360.c6
-rw-r--r--sys/i386/isa/atapi.c2
-rw-r--r--sys/i386/isa/clock.c4
-rw-r--r--sys/i386/isa/if_ie.c12
-rw-r--r--sys/i386/isa/intr_machdep.c4
-rw-r--r--sys/i386/isa/istallion.c10
-rw-r--r--sys/i386/isa/nmi.c4
-rw-r--r--sys/i386/isa/pcvt/pcvt_drv.c4
-rw-r--r--sys/i386/isa/pnp.c20
-rw-r--r--sys/i386/isa/rp.c12
-rw-r--r--sys/i386/isa/sound/ad1848.c4
-rw-r--r--sys/i386/isa/sound/dev_table.c12
-rw-r--r--sys/i386/isa/sound/gus_card.c2
-rw-r--r--sys/i386/isa/sound/gus_wave.c193
-rw-r--r--sys/i386/isa/sound/midibuf.c4
-rw-r--r--sys/i386/isa/sound/opl3.c2
-rw-r--r--sys/i386/isa/sound/pas2_card.c8
-rw-r--r--sys/i386/isa/sound/pas2_mixer.c2
-rw-r--r--sys/i386/isa/sound/pas2_pcm.c6
-rw-r--r--sys/i386/isa/sound/sb_dsp.c10
-rw-r--r--sys/i386/isa/sound/sb_midi.c4
-rw-r--r--sys/i386/isa/sound/sequencer.c10
-rw-r--r--sys/i386/isa/sound/soundcard.c23
-rw-r--r--sys/i386/isa/spkr.c4
-rw-r--r--sys/i386/isa/stallion.c10
-rw-r--r--sys/i386/isa/wcd.c8
-rw-r--r--sys/i386/isa/wfd.c6
-rw-r--r--sys/i386/linux/imgact_linux.c8
-rw-r--r--sys/i386/linux/linux_sysvec.c26
41 files changed, 270 insertions, 262 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 1f5e239..58e75b8 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $
+ * $Id: apm.c,v 1.68 1998/01/24 02:54:08 eivind Exp $
*/
#include "opt_devfs.h"
@@ -103,7 +103,7 @@ setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_
ssdtosd(gdt_segs + GAPMDATA_SEL , &gdt[GAPMDATA_SEL ].sd);
}
-/* 48bit far pointer */
+/* 48bit far pointer. Do not staticize - used from apm_setup.s */
struct addr48 {
u_long offset;
u_short segment;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 1f5e239..58e75b8 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $
+ * $Id: apm.c,v 1.68 1998/01/24 02:54:08 eivind Exp $
*/
#include "opt_devfs.h"
@@ -103,7 +103,7 @@ setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_
ssdtosd(gdt_segs + GAPMDATA_SEL , &gdt[GAPMDATA_SEL ].sd);
}
-/* 48bit far pointer */
+/* 48bit far pointer. Do not staticize - used from apm_setup.s */
struct addr48 {
u_long offset;
u_short segment;
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index de62d63..02a1691 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: eisaconf.c,v 1.32 1997/10/28 15:58:08 bde Exp $
+ * $Id: eisaconf.c,v 1.33 1997/11/07 08:52:24 phk Exp $
*/
#include "opt_eisa.h"
@@ -77,8 +77,8 @@ DATA_SET (eisadriver_set, mainboard_drv);
/*
* Local function declarations and static variables
*/
-void eisa_reg_print __P((struct eisa_device *e_dev, char *string,
- char *separator));
+static void eisa_reg_print __P((struct eisa_device *e_dev,
+ char *string, char *separator));
static int eisa_add_resvaddr __P((struct eisa_device *e_dev,
struct resvlist *head, u_long base,
u_long size, int flags));
@@ -312,7 +312,7 @@ eisa_reg_start(e_dev)
* Output an optional character separator before the string
* if the line does not wrap.
*/
-void
+static void
eisa_reg_print(e_dev, string, separator)
struct eisa_device *e_dev;
char *string;
diff --git a/sys/i386/eisa/if_vx_eisa.c b/sys/i386/eisa/if_vx_eisa.c
index 8002b16..68fca3f 100644
--- a/sys/i386/eisa/if_vx_eisa.c
+++ b/sys/i386/eisa/if_vx_eisa.c
@@ -73,7 +73,7 @@ static const char *vx_match __P((eisa_id_t type));
static int vx_eisa_probe __P((void));
static int vx_eisa_attach __P((struct eisa_device *));
-struct eisa_driver vx_eisa_driver = {
+static struct eisa_driver vx_eisa_driver = {
"vx",
vx_eisa_probe,
vx_eisa_attach,
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index b28deb3..88e6103 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bios.c,v 1.8 1997/11/07 08:52:26 phk Exp $
+ * $Id: bios.c,v 1.9 1998/01/01 13:26:55 msmith Exp $
*/
/*
@@ -43,9 +43,9 @@
#define BIOS_SIZE 0x20000
/* exported lookup results */
-struct bios32_SDentry PCIbios = {entry : 0};
-struct SMBIOS_table *SMBIOStable = 0;
-struct DMI_table *DMItable = 0;
+struct bios32_SDentry PCIbios = {entry : 0};
+static struct SMBIOS_table *SMBIOStable = 0;
+static struct DMI_table *DMItable = 0;
static caddr_t bios32_SDCI = NULL;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 7397775..0b5a162 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.63 1997/12/15 01:14:10 tegge Exp $
+ * $Id: mp_machdep.c,v 1.64 1997/12/15 02:18:20 tegge Exp $
*/
#include "opt_smp.h"
@@ -265,7 +265,7 @@ static struct {
/* Bitmap of all available CPUs */
u_int all_cpus;
-/* AP uses this PTD during bootstrap */
+/* AP uses this PTD during bootstrap. Do not staticize. */
pd_entry_t *bootPTD;
/* Hotwire a 0->4MB V==P mapping */
@@ -689,10 +689,10 @@ static int default_data[7][5] =
/* the bus data */
-bus_datum bus_data[NBUS];
+static bus_datum bus_data[NBUS];
/* the IO INT data, one entry per possible APIC INTerrupt */
-io_int io_apic_ints[NINTR];
+static io_int io_apic_ints[NINTR];
static int nintrs;
@@ -1984,12 +1984,13 @@ int smp_active = 0; /* are the APs allowed to run? */
SYSCTL_INT(_machdep, OID_AUTO, smp_active, CTLFLAG_RW, &smp_active, 0, "");
/* XXX maybe should be hw.ncpu */
-int smp_cpus = 1; /* how many cpu's running */
+static int smp_cpus = 1; /* how many cpu's running */
SYSCTL_INT(_machdep, OID_AUTO, smp_cpus, CTLFLAG_RD, &smp_cpus, 0, "");
int invltlb_ok = 0; /* throttle smp_invltlb() till safe */
SYSCTL_INT(_machdep, OID_AUTO, invltlb_ok, CTLFLAG_RW, &invltlb_ok, 0, "");
+/* Warning: Do not staticize. Used from swtch.s */
int do_page_zero_idle = 0; /* bzero pages for fun and profit in idleloop */
SYSCTL_INT(_machdep, OID_AUTO, do_page_zero_idle, CTLFLAG_RW,
&do_page_zero_idle, 0, "");
@@ -2092,6 +2093,7 @@ putfmtrr()
#define CHECKSTATE_SYS 1
#define CHECKSTATE_INTR 2
+/* Do not staticize. Used from apic_vector.s */
struct proc* checkstate_curproc[NCPU];
int checkstate_cpustate[NCPU];
u_long checkstate_pc[NCPU];
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 7397775..0b5a162 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.63 1997/12/15 01:14:10 tegge Exp $
+ * $Id: mp_machdep.c,v 1.64 1997/12/15 02:18:20 tegge Exp $
*/
#include "opt_smp.h"
@@ -265,7 +265,7 @@ static struct {
/* Bitmap of all available CPUs */
u_int all_cpus;
-/* AP uses this PTD during bootstrap */
+/* AP uses this PTD during bootstrap. Do not staticize. */
pd_entry_t *bootPTD;
/* Hotwire a 0->4MB V==P mapping */
@@ -689,10 +689,10 @@ static int default_data[7][5] =
/* the bus data */
-bus_datum bus_data[NBUS];
+static bus_datum bus_data[NBUS];
/* the IO INT data, one entry per possible APIC INTerrupt */
-io_int io_apic_ints[NINTR];
+static io_int io_apic_ints[NINTR];
static int nintrs;
@@ -1984,12 +1984,13 @@ int smp_active = 0; /* are the APs allowed to run? */
SYSCTL_INT(_machdep, OID_AUTO, smp_active, CTLFLAG_RW, &smp_active, 0, "");
/* XXX maybe should be hw.ncpu */
-int smp_cpus = 1; /* how many cpu's running */
+static int smp_cpus = 1; /* how many cpu's running */
SYSCTL_INT(_machdep, OID_AUTO, smp_cpus, CTLFLAG_RD, &smp_cpus, 0, "");
int invltlb_ok = 0; /* throttle smp_invltlb() till safe */
SYSCTL_INT(_machdep, OID_AUTO, invltlb_ok, CTLFLAG_RW, &invltlb_ok, 0, "");
+/* Warning: Do not staticize. Used from swtch.s */
int do_page_zero_idle = 0; /* bzero pages for fun and profit in idleloop */
SYSCTL_INT(_machdep, OID_AUTO, do_page_zero_idle, CTLFLAG_RW,
&do_page_zero_idle, 0, "");
@@ -2092,6 +2093,7 @@ putfmtrr()
#define CHECKSTATE_SYS 1
#define CHECKSTATE_INTR 2
+/* Do not staticize. Used from apic_vector.s */
struct proc* checkstate_curproc[NCPU];
int checkstate_cpustate[NCPU];
u_long checkstate_pc[NCPU];
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 0a2024d..73ea393 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.182 1998/02/05 03:31:42 dyson Exp $
+ * $Id: pmap.c,v 1.183 1998/02/06 12:13:09 eivind Exp $
*/
/*
@@ -152,22 +152,22 @@ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */
vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */
static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */
static vm_offset_t vm_first_phys;
-int pgeflag; /* PG_G or-in */
-int pseflag; /* PG_PS or-in */
-int pv_npg;
+static int pgeflag; /* PG_G or-in */
+static int pseflag; /* PG_PS or-in */
+static int pv_npg;
-int nkpt;
+static int nkpt;
vm_offset_t kernel_vm_end;
/*
* Data for the pv entry allocation mechanism
*/
-vm_zone_t pvzone;
-struct vm_zone pvzone_store;
-struct vm_object pvzone_obj;
-int pv_entry_count=0, pv_entry_max=0, pv_entry_high_water=0;
-int pmap_pagedaemon_waken = 0;
-struct pv_entry *pvinit;
+static vm_zone_t pvzone;
+static struct vm_zone pvzone_store;
+static struct vm_object pvzone_obj;
+static int pv_entry_count=0, pv_entry_max=0, pv_entry_high_water=0;
+static int pmap_pagedaemon_waken = 0;
+static struct pv_entry *pvinit;
/*
* All those kernel PT submaps that BSD is so fond of
@@ -187,8 +187,8 @@ extern pd_entry_t *IdlePTDS[];
extern pt_entry_t SMP_prvpt[];
#endif
-pt_entry_t *PMAP1 = 0;
-unsigned *PADDR1 = 0;
+static pt_entry_t *PMAP1 = 0;
+static unsigned *PADDR1 = 0;
static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv));
static unsigned * get_ptbase __P((pmap_t pmap));
@@ -219,7 +219,7 @@ static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t));
vm_offset_t pmap_kmem_choose(vm_offset_t addr) ;
void pmap_collect(void);
-unsigned pdir4mb;
+static unsigned pdir4mb;
/*
* Routine: pmap_pte
@@ -252,7 +252,7 @@ pmap_pte(pmap, va)
* by using a large (4MB) page for much of the kernel
* (.text, .data, .bss)
*/
-vm_offset_t
+static vm_offset_t
pmap_kmem_choose(vm_offset_t addr) {
vm_offset_t newaddr = addr;
#ifndef DISABLE_PSE
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 435e451..d3fae02 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.30 1997/11/26 22:45:47 joerg Exp $
+ * $Id: sys_machdep.c,v 1.31 1997/12/27 03:00:59 peter Exp $
*
*/
@@ -253,7 +253,7 @@ done:
#ifdef USER_LDT
/*
* Update the GDT entry pointing to the LDT to point to the LDT of the
- * current process.
+ * current process. Do not staticize.
*/
void
set_user_ldt(struct pcb *pcb)
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index da85b08..0732bd1 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.107 1997/12/28 17:33:10 phk Exp $
+ * $Id: clock.c,v 1.108 1998/01/28 10:41:33 phk Exp $
*/
/*
@@ -132,7 +132,7 @@ u_int tsc_bias;
u_int tsc_comultiplier;
u_int tsc_freq;
u_int tsc_multiplier;
-u_int tsc_present;
+static u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
static int beeping = 0;
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index b69dec9..ad5521d 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: imgact_coff.c,v 1.27 1997/09/21 04:22:29 dyson Exp $
+ * $Id: imgact_coff.c,v 1.28 1997/12/27 02:56:18 bde Exp $
*/
#include <sys/param.h>
@@ -53,8 +53,8 @@
extern struct sysentvec ibcs2_svr3_sysvec;
-extern int coff_load_file __P((struct proc *p, char *name));
-extern int exec_coff_imgact __P((struct image_params *imgp));
+static int coff_load_file __P((struct proc *p, char *name));
+static int exec_coff_imgact __P((struct image_params *imgp));
static int load_coff_section __P((struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot));
@@ -148,7 +148,7 @@ load_coff_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset,
return error;
}
-int
+static int
coff_load_file(struct proc *p, char *name)
{
struct vmspace *vmspace = p->p_vmspace;
@@ -283,7 +283,7 @@ coff_load_file(struct proc *p, char *name)
return error;
}
-int
+static int
exec_coff_imgact(imgp)
struct image_params *imgp;
{
@@ -475,5 +475,5 @@ exec_coff_imgact(imgp)
* Since `const' objects end up in the text segment, TEXT_SET is the
* correct directive to use.
*/
-const struct execsw coff_execsw = { exec_coff_imgact, "coff" };
+static const struct execsw coff_execsw = { exec_coff_imgact, "coff" };
TEXT_SET(execsw_set, coff_execsw);
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 7397775..0b5a162 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.63 1997/12/15 01:14:10 tegge Exp $
+ * $Id: mp_machdep.c,v 1.64 1997/12/15 02:18:20 tegge Exp $
*/
#include "opt_smp.h"
@@ -265,7 +265,7 @@ static struct {
/* Bitmap of all available CPUs */
u_int all_cpus;
-/* AP uses this PTD during bootstrap */
+/* AP uses this PTD during bootstrap. Do not staticize. */
pd_entry_t *bootPTD;
/* Hotwire a 0->4MB V==P mapping */
@@ -689,10 +689,10 @@ static int default_data[7][5] =
/* the bus data */
-bus_datum bus_data[NBUS];
+static bus_datum bus_data[NBUS];
/* the IO INT data, one entry per possible APIC INTerrupt */
-io_int io_apic_ints[NINTR];
+static io_int io_apic_ints[NINTR];
static int nintrs;
@@ -1984,12 +1984,13 @@ int smp_active = 0; /* are the APs allowed to run? */
SYSCTL_INT(_machdep, OID_AUTO, smp_active, CTLFLAG_RW, &smp_active, 0, "");
/* XXX maybe should be hw.ncpu */
-int smp_cpus = 1; /* how many cpu's running */
+static int smp_cpus = 1; /* how many cpu's running */
SYSCTL_INT(_machdep, OID_AUTO, smp_cpus, CTLFLAG_RD, &smp_cpus, 0, "");
int invltlb_ok = 0; /* throttle smp_invltlb() till safe */
SYSCTL_INT(_machdep, OID_AUTO, invltlb_ok, CTLFLAG_RW, &invltlb_ok, 0, "");
+/* Warning: Do not staticize. Used from swtch.s */
int do_page_zero_idle = 0; /* bzero pages for fun and profit in idleloop */
SYSCTL_INT(_machdep, OID_AUTO, do_page_zero_idle, CTLFLAG_RW,
&do_page_zero_idle, 0, "");
@@ -2092,6 +2093,7 @@ putfmtrr()
#define CHECKSTATE_SYS 1
#define CHECKSTATE_INTR 2
+/* Do not staticize. Used from apic_vector.s */
struct proc* checkstate_curproc[NCPU];
int checkstate_cpustate[NCPU];
u_long checkstate_pc[NCPU];
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 67cfb97..9424b5c 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
*/
/*
- * $Id: aic6360.c,v 1.35 1997/10/26 21:08:39 nate Exp $
+ * $Id: aic6360.c,v 1.36 1997/11/20 15:48:23 nate Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -706,7 +706,7 @@ static struct scsi_device aic_dev = {
#include <pccard/slot.h>
static int aicinit(struct pccard_devinfo *); /* init device */
-void aicunload(struct pccard_devinfo *); /* Disable driver */
+static void aicunload(struct pccard_devinfo *); /* Disable driver */
static int aic_card_intr(struct pccard_devinfo *); /* Interrupt handler */
static struct pccard_device aic_info = {
@@ -759,7 +759,7 @@ aicinit(struct pccard_devinfo *devi)
* and ensure that any driver entry points such as
* read and write do not hang.
*/
-void
+static void
aicunload(struct pccard_devinfo *devi)
{
printf("aic%d: unload\n", devi->isahd.id_unit);
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 09439cb..588bb3d 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -160,7 +160,7 @@ int atapi_attach (int ctlr, int unit, int port)
#define PHASE_COMPLETED (ARI_IN | ARI_CMD)
#define PHASE_ABORTED 0 /* nonstandard - for NEC 260 */
-struct atapi atapitab[NWDC];
+static struct atapi atapitab[NWDC];
static struct atapi_params *atapi_probe (int port, int unit);
static int atapi_wait (int port, u_char bits_wanted);
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index da85b08..0732bd1 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.107 1997/12/28 17:33:10 phk Exp $
+ * $Id: clock.c,v 1.108 1998/01/28 10:41:33 phk Exp $
*/
/*
@@ -132,7 +132,7 @@ u_int tsc_bias;
u_int tsc_comultiplier;
u_int tsc_freq;
u_int tsc_multiplier;
-u_int tsc_present;
+static u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
static int beeping = 0;
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 5e2f30c..1eeb533 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.48 1997/12/15 20:30:49 eivind Exp $
+ * $Id: if_ie.c,v 1.49 1998/01/08 23:40:56 eivind Exp $
*/
/*
@@ -165,7 +165,7 @@ iomem and and with 0xffff.
#define IED_RNR 0x04
#define IED_CNA 0x08
#define IED_READFRAME 0x10
-int ie_debug = IED_RNR;
+static int ie_debug = IED_RNR;
#endif
@@ -224,10 +224,10 @@ static int mc_setup(int, caddr_t, volatile struct ie_sys_ctl_block *);
static void ie_mc_reset(int unit);
#ifdef DEBUG
-void print_rbd(volatile struct ie_recv_buf_desc * rbd);
+static void print_rbd(volatile struct ie_recv_buf_desc * rbd);
-int in_ierint = 0;
-int in_ietint = 0;
+static int in_ierint = 0;
+static int in_ietint = 0;
#endif
@@ -2413,7 +2413,7 @@ setflag:
#ifdef DEBUG
-void
+static void
print_rbd(volatile struct ie_recv_buf_desc * rbd)
{
printf("RBD at %08lx:\n"
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 80ae7b8..4a593ea7 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: intr_machdep.c,v 1.6 1997/08/30 08:08:04 fsmp Exp $
+ * $Id: intr_machdep.c,v 1.7 1997/09/28 15:48:34 mckay Exp $
*/
#include "opt_auto_eoi.h"
@@ -83,7 +83,7 @@
u_long *intr_countp[ICU_LEN];
inthand2_t *intr_handler[ICU_LEN];
u_int intr_mask[ICU_LEN];
-u_int* intr_mptr[ICU_LEN];
+static u_int* intr_mptr[ICU_LEN];
int intr_unit[ICU_LEN];
static inthand_t *fastintr[ICU_LEN] = {
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 2c47749..e74ec01 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: istallion.c,v 1.14 1997/12/06 13:22:33 bde Exp $
+ * $Id: istallion.c,v 1.15 1997/12/16 17:40:00 eivind Exp $
*/
/*****************************************************************************/
@@ -520,8 +520,8 @@ static char *stli_brdnames[] = {
* Declare all those functions in this driver! First up is the set of
* externally visible functions.
*/
-int stliprobe(struct isa_device *idp);
-int stliattach(struct isa_device *idp);
+static int stliprobe(struct isa_device *idp);
+static int stliattach(struct isa_device *idp);
STATIC d_open_t stliopen;
STATIC d_close_t stliclose;
@@ -816,7 +816,7 @@ static int stli_mcaprobe(struct isa_device *idp)
* shared memory region to see if the board is really there or not...
*/
-int stliprobe(struct isa_device *idp)
+static int stliprobe(struct isa_device *idp)
{
stlibrd_t *brdp;
int btype, bclass;
@@ -904,7 +904,7 @@ int stliprobe(struct isa_device *idp)
* Allocate resources for and initialize a board.
*/
-int stliattach(struct isa_device *idp)
+static int stliattach(struct isa_device *idp)
{
stlibrd_t *brdp;
int brdnr;
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 80ae7b8..4a593ea7 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: intr_machdep.c,v 1.6 1997/08/30 08:08:04 fsmp Exp $
+ * $Id: intr_machdep.c,v 1.7 1997/09/28 15:48:34 mckay Exp $
*/
#include "opt_auto_eoi.h"
@@ -83,7 +83,7 @@
u_long *intr_countp[ICU_LEN];
inthand2_t *intr_handler[ICU_LEN];
u_int intr_mask[ICU_LEN];
-u_int* intr_mptr[ICU_LEN];
+static u_int* intr_mptr[ICU_LEN];
int intr_unit[ICU_LEN];
static inthand_t *fastintr[ICU_LEN] = {
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 3411292..c589b0d 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -104,7 +104,7 @@ extern int getchar __P((void));
extern u_short *Crtat;
#endif /* PCVT_NETBSD */
-unsigned __debug = 0; /*0xffe */
+static unsigned __debug = 0; /*0xffe */
static __color;
static nrow;
@@ -780,7 +780,7 @@ pcmmap(Dev_t dev, int offset, int nprot)
#if PCVT_KBD_FIFO
u_char pcvt_kbd_fifo[PCVT_KBD_FIFO_SZ];
-int pcvt_kbd_wptr = 0;
+static int pcvt_kbd_wptr = 0;
int pcvt_kbd_rptr = 0;
short pcvt_kbd_count= 0;
static u_char pcvt_timeout_scheduled = 0;
diff --git a/sys/i386/isa/pnp.c b/sys/i386/isa/pnp.c
index 3d4b4f1..3bc63ed 100644
--- a/sys/i386/isa/pnp.c
+++ b/sys/i386/isa/pnp.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pnp.c,v 1.3 1997/09/19 15:20:24 jmg Exp $
+ * $Id: pnp.c,v 1.4 1997/11/18 11:45:26 bde Exp $
*/
#include <sys/param.h>
@@ -38,7 +38,7 @@
#include <i386/isa/isa_device.h>
#include <i386/isa/pnp.h>
-int num_pnp_cards = 0;
+static int num_pnp_cards = 0;
pnp_id pnp_devices[MAX_PNP_CARDS];
struct pnp_dlist_node *pnp_device_list;
static struct pnp_dlist_node **pnp_device_list_last_ptr;
@@ -100,10 +100,10 @@ nullpnp_attach(u_long csn, u_long vend_id, char *name,
/* The READ_DATA port that we are using currently */
static int pnp_rd_port;
-void pnp_send_Initiation_LFSR (void);
-int pnp_get_serial (pnp_id *p);
-void config_pnp_device (pnp_id *p, int csn);
-int pnp_isolation_protocol (void);
+static void pnp_send_Initiation_LFSR (void);
+static int pnp_get_serial (pnp_id *p);
+static void config_pnp_device (pnp_id *p, int csn);
+static int pnp_isolation_protocol (void);
void pnp_write(int d, u_char r);
u_char pnp_read(int d);
@@ -125,7 +125,7 @@ pnp_read(int d)
* Send Initiation LFSR as described in "Plug and Play ISA Specification",
* Intel May 94.
*/
-void
+static void
pnp_send_Initiation_LFSR()
{
int cur, i;
@@ -147,7 +147,7 @@ pnp_send_Initiation_LFSR()
/*
* Get the device's serial number. Returns 1 if the serial is valid.
*/
-int
+static int
pnp_get_serial(pnp_id *p)
{
int i, bit, valid = 0, sum = 0x6a;
@@ -329,7 +329,7 @@ enable_pnp_card()
* 4 bytes: board serial number (often 0 or -1 ?)
*/
-void
+static void
config_pnp_device(pnp_id *p, int csn)
{
static struct pnp_dlist_node *nod = NULL;
@@ -478,7 +478,7 @@ config_pnp_device(pnp_id *p, int csn)
* are saved to an array, pnp_devices. In the second pass, each
* card is woken up and the device configuration is called.
*/
-int
+static int
pnp_isolation_protocol()
{
int csn;
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 9a578bd..53373b0 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -61,7 +61,7 @@
#define FALSE 0
#endif
-Byte_t RData[RDATASIZE] =
+static Byte_t RData[RDATASIZE] =
{
0x00, 0x09, 0xf6, 0x82,
0x02, 0x09, 0x86, 0xfb,
@@ -83,7 +83,7 @@ Byte_t RData[RDATASIZE] =
0x22, 0x09, 0x0a, 0x0a
};
-Byte_t RRegData[RREGDATASIZE]=
+static Byte_t RRegData[RREGDATASIZE]=
{
0x00, 0x09, 0xf6, 0x82, /* 00: Stop Rx processor */
0x08, 0x09, 0x8a, 0x13, /* 04: Tx software flow control */
@@ -100,7 +100,7 @@ Byte_t RRegData[RREGDATASIZE]=
0x22, 0x09, 0x0a, 0x0a /* 30: Rx FIFO Enable */
};
-CONTROLLER_T sController[CTL_SIZE] =
+static CONTROLLER_T sController[CTL_SIZE] =
{
{-1,-1,0,0,0,0,0,0,0,0,0,{0,0,0,0},{0,0,0,0},{-1,-1,-1,-1},{0,0,0,0}},
{-1,-1,0,0,0,0,0,0,0,0,0,{0,0,0,0},{0,0,0,0},{-1,-1,-1,-1},{0,0,0,0}},
@@ -116,12 +116,12 @@ Byte_t sIRQMap[16] =
};
#endif
-Byte_t sBitMapClrTbl[8] =
+static Byte_t sBitMapClrTbl[8] =
{
0xfe,0xfd,0xfb,0xf7,0xef,0xdf,0xbf,0x7f
};
-Byte_t sBitMapSetTbl[8] =
+static Byte_t sBitMapSetTbl[8] =
{
0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
};
@@ -772,7 +772,7 @@ static char* rp_pciprobe(pcici_t tag, pcidi_t type);
static void rp_pciattach(pcici_t tag, int unit);
static u_long rp_pcicount;
-struct pci_device rp_pcidevice = {
+static struct pci_device rp_pcidevice = {
"rp",
rp_pciprobe,
rp_pciattach,
diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index e41edd9..8683d53 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -57,10 +57,6 @@
#include <i386/isa/sound/ad1848_mixer.h>
#include <i386/isa/sound/iwdefs.h>
-#if !defined(CONFIG_CS4232)
-extern struct isa_driver mssdriver;
-#endif
-
extern void IwaveStopDma(BYTE path);
typedef struct {
diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c
index 42e5197..3061170 100644
--- a/sys/i386/isa/sound/dev_table.c
+++ b/sys/i386/isa/sound/dev_table.c
@@ -36,11 +36,11 @@ int sound_started = 0;
int sndtable_get_cardcount(void);
int snd_find_driver(int type);
-void sndtable_init(void);
+static void sndtable_init(void);
int sndtable_probe(int unit, struct address_info * hw_config);
int sndtable_init_card(int unit, struct address_info * hw_config);
-int sndtable_identify_card(char *name);
-void sound_chconf(int card_type, int ioaddr, int irq, int dma);
+static int sndtable_identify_card(char *name);
+static void sound_chconf(int card_type, int ioaddr, int irq, int dma);
static void start_services(void);
static void start_cards(void);
struct address_info *sound_getconf(int card_type);
@@ -115,7 +115,7 @@ start_cards()
printf("Sound initialization complete\n");
}
-void
+static void
sndtable_init()
{
start_cards();
@@ -242,7 +242,7 @@ sndtable_get_cardcount(void)
return num_audiodevs + num_mixers + num_synths + num_midis;
}
-int
+static int
sndtable_identify_card(char *name)
{
int i, n = num_sound_drivers;
@@ -262,7 +262,7 @@ sndtable_identify_card(char *name)
return 0;
}
-void
+static void
sound_chconf(int card_type, int ioaddr, int irq, int dma)
{
int j, ptr = -1, n = num_sound_cards;
diff --git a/sys/i386/isa/sound/gus_card.c b/sys/i386/isa/sound/gus_card.c
index 2f73ce6..7dac1bd 100644
--- a/sys/i386/isa/sound/gus_card.c
+++ b/sys/i386/isa/sound/gus_card.c
@@ -40,7 +40,7 @@ extern int gus_pcm_volume;
extern int have_gus_max;
extern int gus_timer_enabled;
-sound_os_info *gus_osp;
+static sound_os_info *gus_osp;
#ifndef NOGUSPNP
int IwaveOpen(char voices, char mode, struct address_info * hw);
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index 8cb3419..cd04999 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -53,7 +53,7 @@
#if defined(CONFIG_GUS)
-IWAVE iw;
+static IWAVE iw;
#define ENTER_CRITICAL
#define LEAVE_CRITICAL
@@ -62,7 +62,7 @@ IWAVE iw;
#define MAX_PATCH 256
-u_int gus_pnp_found[MAX_GUS_PNP] =
+static u_int gus_pnp_found[MAX_GUS_PNP] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
struct voice_info {
@@ -118,7 +118,7 @@ static int only_read_access = 0;
static int only_8_bits = 0;
int gus_wave_volume = 60;
-int gus_pcm_volume = 80;
+static int gus_pcm_volume = 80;
int have_gus_max = 0;
static int gus_line_vol = 100, gus_mic_vol = 0;
static u_char mix_image = 0x00;
@@ -161,7 +161,7 @@ static int pcm_current_intrflag;
extern sound_os_info *gus_osp;
-struct voice_info voices[32];
+static struct voice_info voices[32];
static int freq_div_table[] =
{
@@ -187,8 +187,8 @@ static int freq_div_table[] =
};
static struct patch_info *samples;
-struct patch_info *dbg_samples;
-int dbg_samplep;
+static struct patch_info *dbg_samples;
+static int dbg_samplep;
static long sample_ptrs[MAX_SAMPLE + 1];
static int sample_map[32];
@@ -204,20 +204,20 @@ static struct synth_info gus_info =
static void gus_default_mixer_init(void);
-int guswave_start_note2(int dev, int voice, int note_num, int volume);
+static int guswave_start_note2(int dev, int voice, int note_num, int volume);
static void gus_poke(long addr, u_char data);
-void compute_and_set_volume(int voice, int volume, int ramp_time);
+static void compute_and_set_volume(int voice, int volume, int ramp_time);
extern u_short gus_adagio_vol(int vel, int mainv, int xpn, int voicev);
extern u_short gus_linear_vol(int vol, int mainvol);
-void compute_volume(int voice, int volume);
+static void compute_volume(int voice, int volume);
void do_volume_irq(int voice);
static void set_input_volumes(void);
static void gus_tmr_install(int io_base);
-void SEND(int d, int r);
-int get_serial(int rd_port, u_char *data);
-void send_Initiation_LFSR(void);
-int isolation_protocol(int rd_port);
+static void SEND(int d, int r);
+static int get_serial(int rd_port, u_char *data);
+static void send_Initiation_LFSR(void);
+static int isolation_protocol(int rd_port);
#define INSTANT_RAMP -1 /* Instant change. No ramping */
@@ -295,48 +295,49 @@ int isolation_protocol(int rd_port);
{ outb(iwl_codec_base, reg); val = inb(iwl_codec_data); }
-u_char gus_look8(int reg);
-
-void gus_write16(int reg, u_int data);
-
-u_short gus_read16(int reg);
-
-void gus_write_addr(int reg, u_long address, int is16bit);
-void IwaveLineLevel(char level, char index);
-void IwaveInputSource(BYTE index, BYTE source);
-void IwaveDelay(WORD count);
-void IwaveStopDma(BYTE path);
-void IwavePnpGetCfg(void);
-void IwavePnpDevice(BYTE dev);
-void IwavePnpSetCfg(void);
-void IwavePnpKey(void);
-BYTE IwavePnpIsol(PORT * pnpread);
-void IwaveCfgIOSpace(void);
-
-void IwavePnpSerial(PORT pnprdp, BYTE csn, BYTE * vendor, DWORD * serial);
-
-
-void IwavePnpPeek(PORT pnprdp, WORD bytes, BYTE * data);
-void IwavePnpEeprom(BYTE ctrl);
-void IwavePnpActivate(BYTE dev, BYTE bool);
-
-void IwavePnpPower(BYTE mode);
-void IwavePnpWake(BYTE csn);
-PORT IwavePnpIOcheck(PORT base, BYTE no_ports);
-
-BYTE IwavePnpGetCSN(DWORD VendorID, BYTE csn_max);
-BYTE IwavePnpPing(DWORD VendorID);
-WORD IwaveMemSize(void);
-BYTE IwaveMemPeek(ADDRESS addr);
-void IwaveMemPoke(ADDRESS addr, BYTE datum);
-void IwaveMemCfg(DWORD * lpbanks);
-void IwaveCodecIrq(BYTE mode);
-WORD IwaveRegPeek(DWORD reg_mnem);
-
-void IwaveRegPoke(DWORD reg_mnem, WORD datum);
-void IwaveCodecMode(char mode);
-void IwaveLineMute(BYTE mute, BYTE inx);
-void Iwaveinitcodec(void);
+static u_char gus_look8(int reg);
+
+static void gus_write16(int reg, u_int data);
+
+static u_short gus_read16(int reg);
+
+static void gus_write_addr(int reg, u_long address, int is16bit);
+static void IwaveLineLevel(char level, char index);
+static void IwaveInputSource(BYTE index, BYTE source);
+static void IwaveDelay(WORD count);
+static void IwaveStopDma(BYTE path);
+static void IwavePnpGetCfg(void);
+static void IwavePnpDevice(BYTE dev);
+static void IwavePnpSetCfg(void);
+static void IwavePnpKey(void);
+static BYTE IwavePnpIsol(PORT * pnpread);
+static void IwaveCfgIOSpace(void);
+
+static void IwavePnpSerial(PORT pnprdp, BYTE csn,
+ BYTE * vendor, DWORD * serial);
+
+
+static void IwavePnpPeek(PORT pnprdp, WORD bytes, BYTE * data);
+static void IwavePnpEeprom(BYTE ctrl);
+static void IwavePnpActivate(BYTE dev, BYTE bool);
+
+static void IwavePnpPower(BYTE mode);
+static void IwavePnpWake(BYTE csn);
+static PORT IwavePnpIOcheck(PORT base, BYTE no_ports);
+
+static BYTE IwavePnpGetCSN(DWORD VendorID, BYTE csn_max);
+static BYTE IwavePnpPing(DWORD VendorID);
+static WORD IwaveMemSize(void);
+static BYTE IwaveMemPeek(ADDRESS addr);
+static void IwaveMemPoke(ADDRESS addr, BYTE datum);
+static void IwaveMemCfg(DWORD * lpbanks);
+static void IwaveCodecIrq(BYTE mode);
+static WORD IwaveRegPeek(DWORD reg_mnem);
+
+static void IwaveRegPoke(DWORD reg_mnem, WORD datum);
+static void IwaveCodecMode(char mode);
+static void IwaveLineMute(BYTE mute, BYTE inx);
+static void Iwaveinitcodec(void);
int IwaveOpen(char voices, char mode, struct address_info * hw);
@@ -431,7 +432,7 @@ gus_read8(int reg)
return val;
}
-u_char
+static u_char
gus_look8(int reg)
{ /* Reads from an indirect register (8 bit). No additional offset. */
u_long flags;
@@ -445,7 +446,7 @@ gus_look8(int reg)
return val;
}
-void
+static void
gus_write16(int reg, u_int data)
{ /* Writes to an indirect register (16 bit) */
u_long flags;
@@ -460,7 +461,7 @@ gus_write16(int reg, u_int data)
splx(flags);
}
-u_short
+static u_short
gus_read16(int reg)
{ /* Reads from an indirect register (16 bit). Offset 0x80. */
u_long flags;
@@ -478,7 +479,7 @@ gus_read16(int reg)
return ((hi << 8) & 0xff00) | lo;
}
-void
+static void
gus_write_addr(int reg, u_long address, int is16bit)
{ /* Writes an 24 bit memory address */
u_long hold_address;
@@ -1103,7 +1104,7 @@ guswave_volume_method(int dev, int mode)
volume_method = mode;
}
-void
+static void
compute_volume(int voice, int volume)
{
if (volume < 128)
@@ -1130,7 +1131,7 @@ compute_volume(int voice, int volume)
voices[voice].initial_volume = 4030;
}
-void
+static void
compute_and_set_volume(int voice, int volume, int ramp_time)
{
int curr, target, rate;
@@ -1276,7 +1277,7 @@ guswave_controller(int dev, int voice, int ctrl_num, int value)
}
}
-int
+static int
guswave_start_note2(int dev, int voice, int note_num, int volume)
{
int sample, best_sample, best_delta, delta_freq;
@@ -2905,7 +2906,7 @@ if (have_gus_max) {
/* start of pnp code */
-void
+static void
SEND(int d, int r)
{
outb(PADDRESS, d);
@@ -2918,7 +2919,7 @@ outb(PWRITE_DATA, r);
/*
* Get the device's serial number. Returns 1 if the serial is valid.
*/
-int
+static int
get_serial(int rd_port, u_char *data)
{
int i, bit, valid = 0, sum = 0x6a;
@@ -2946,7 +2947,7 @@ get_serial(int rd_port, u_char *data)
return valid;
}
-void
+static void
send_Initiation_LFSR()
{
int cur, i;
@@ -2966,7 +2967,7 @@ send_Initiation_LFSR()
-int
+static int
isolation_protocol(int rd_port)
{
int csn;
@@ -3006,7 +3007,7 @@ isolation_protocol(int rd_port)
-void
+static void
IwaveDelay(WORD count)
{
WORD cur_cnt = 0, last_cnt;
@@ -3041,7 +3042,7 @@ IwaveDelay(WORD count)
* ########################################################################
*/
-void
+static void
IwaveStopDma(BYTE path)
{
BYTE reg;
@@ -3068,7 +3069,7 @@ IwaveStopDma(BYTE path)
*
* ########################################################################
*/
-void
+static void
IwaveInputSource(BYTE index, BYTE source)
{
BYTE reg;
@@ -3081,7 +3082,7 @@ IwaveInputSource(BYTE index, BYTE source)
outb(iw.cdatap, (BYTE) (reg | source));
LEAVE_CRITICAL;
}
-void
+static void
IwavePnpGetCfg(void)
{
WORD val;
@@ -3159,7 +3160,7 @@ IwavePnpGetCfg(void)
LEAVE_CRITICAL;
}
-void
+static void
IwavePnpSetCfg(void)
{
ENTER_CRITICAL;
@@ -3232,7 +3233,7 @@ IwavePnpSetCfg(void)
LEAVE_CRITICAL;
}
-void
+static void
IwaveCfgIOSpace(void)
{
ENTER_CRITICAL;
@@ -3304,7 +3305,7 @@ IwaveCfgIOSpace(void)
/* write cycles of 0x00 to PIDXR before issuing the key. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpKey(void)
{
/* send_Initiation_LFSR(); */
@@ -3329,7 +3330,7 @@ IwavePnpKey(void)
}
-BYTE
+static BYTE
IwavePnpIsol(PORT * pnpread)
{
int num_pnp_devs;
@@ -3374,7 +3375,7 @@ IwavePnpIsol(PORT * pnpread)
/* will be obtained. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpSerial(PORT pnprdp,
BYTE csn,
BYTE * vendor,
@@ -3438,7 +3439,7 @@ IwavePnpSerial(PORT pnprdp,
/* should issue a WAKE[CSN] command */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpPeek(PORT pnprdp, WORD bytes, BYTE * data)
{
WORD i;
@@ -3467,7 +3468,7 @@ IwavePnpPeek(PORT pnprdp, WORD bytes, BYTE * data)
/* IwavePnpActivate(AUDIO,OFF). */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpEeprom(BYTE ctrl)
{
ENTER_CRITICAL;
@@ -3487,7 +3488,7 @@ IwavePnpEeprom(BYTE ctrl)
/* activated. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpActivate(BYTE dev, BYTE bool)
{
IwavePnpDevice(dev); /* select audio device */
@@ -3506,7 +3507,7 @@ IwavePnpActivate(BYTE dev, BYTE bool)
/* that the PNP state machine is in configuration mode. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpDevice(BYTE dev)
{
ENTER_CRITICAL;
@@ -3526,7 +3527,7 @@ IwavePnpDevice(BYTE dev)
/* mode. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpPower(BYTE mode)
{
ENTER_CRITICAL;
@@ -3546,7 +3547,7 @@ IwavePnpPower(BYTE mode)
/* "wait for key" state. */
/* */
/* ######################################################################## */
-void
+static void
IwavePnpWake(BYTE csn)
{
ENTER_CRITICAL;
@@ -3569,7 +3570,7 @@ IwavePnpWake(BYTE csn)
/* activated and that the PNP state machine is in config mode. */
/* */
/* ######################################################################## */
-PORT
+static PORT
IwavePnpIOcheck(PORT base, BYTE no_ports)
{
BYTE i;
@@ -3606,7 +3607,7 @@ IwavePnpIOcheck(PORT base, BYTE no_ports)
/* InterWave IC it will return FALSE. */
/* */
/* ######################################################################## */
-BYTE
+static BYTE
IwavePnpGetCSN(DWORD VendorID, BYTE csn_max)
{
BYTE csn;
@@ -3650,7 +3651,7 @@ IwavePnpGetCSN(DWORD VendorID, BYTE csn_max)
/* sure they are compatible with the board. */
/* */
/* ######################################################################## */
-BYTE
+static BYTE
IwavePnpPing(DWORD VendorID)
{
BYTE csn;
@@ -3681,7 +3682,7 @@ IwavePnpPing(DWORD VendorID)
/* end of pnp code */
-WORD
+static WORD
IwaveMemSize(void)
{
BYTE datum = 0x55;
@@ -3701,7 +3702,7 @@ IwaveMemSize(void)
return ((WORD) (local >> 10));
}
-BYTE
+static BYTE
IwaveMemPeek(ADDRESS addr)
{
PORT p3xr;
@@ -3717,7 +3718,7 @@ IwaveMemPeek(ADDRESS addr)
}
-void
+static void
IwaveMemPoke(ADDRESS addr, BYTE datum)
{
PORT p3xr;
@@ -3751,7 +3752,7 @@ IwaveMemPoke(ADDRESS addr, BYTE datum)
/* full addressing span (LMCFI[3:0]=0xC). */
/* */
/* ######################################################################## */
-void
+static void
IwaveMemCfg(DWORD * lpbanks)
{
DWORD bank[4] = {0L, 0L, 0L, 0L};
@@ -3850,7 +3851,7 @@ IwaveMemCfg(DWORD * lpbanks)
/* IwaveCodeIrq(~CODEC_IRQ_ENABLE). */
/**/
/* ######################################################################## */
-void
+static void
IwaveCodecIrq(BYTE mode)
{
BYTE reg;
@@ -3886,7 +3887,7 @@ IwaveCodecIrq(BYTE mode)
/* meaningless data. */
/**/
/* ######################################################################### */
-WORD
+static WORD
IwaveRegPeek(DWORD reg_mnem)
{
BYTE index, val;
@@ -4016,7 +4017,7 @@ IwaveRegPeek(DWORD reg_mnem)
/* that the writes are to valid registers. */
/**/
/* ######################################################################### */
-void
+static void
IwaveRegPoke(DWORD reg_mnem, WORD datum)
{
BYTE index;
@@ -4131,7 +4132,7 @@ IwaveRegPoke(DWORD reg_mnem, WORD datum)
}
-void
+static void
IwaveLineLevel(char level, char index)
{
char reg;
@@ -4145,7 +4146,7 @@ IwaveLineLevel(char level, char index)
LEAVE_CRITICAL;
}
-void
+static void
IwaveCodecMode(char mode)
{
char reg;
@@ -4158,7 +4159,7 @@ IwaveCodecMode(char mode)
iw.cmode = mode;
}
-void
+static void
IwaveLineMute(BYTE mute, BYTE inx)
{
BYTE reg;
@@ -4173,7 +4174,7 @@ IwaveLineMute(BYTE mute, BYTE inx)
LEAVE_CRITICAL;
}
-void
+static void
Iwaveinitcodec()
{
@@ -4654,7 +4655,7 @@ do_loop_irq(int voice)
splx(flags);
}
-void
+static void
do_volume_irq(int voice)
{
u_char tmp;
diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c
index e452e0a..af5ddc5 100644
--- a/sys/i386/isa/sound/midibuf.c
+++ b/sys/i386/isa/sound/midibuf.c
@@ -40,7 +40,7 @@
int
MIDIbuf_poll (int dev, struct fileinfo *file, int events, select_table * wait);
-void
+static void
drain_midi_queue(int dev);
static int *midi_sleeper[MAX_MIDI_DEV] = {NULL};
@@ -86,7 +86,7 @@ static volatile int open_devs = 0;
splx(flags); \
}
-void
+static void
drain_midi_queue(int dev)
{
diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c
index fbc4398..1baeadd 100644
--- a/sys/i386/isa/sound/opl3.c
+++ b/sys/i386/isa/sound/opl3.c
@@ -351,7 +351,7 @@ opl3_set_instr(int dev, int voice, int instr_no)
* volume -8 it was implemented as a table because it is only 128 bytes and
* it saves a lot of log() calculations. (RH)
*/
-char fm_volume_table[128] =
+static char fm_volume_table[128] =
{
-64, -48, -40, -35, -32, -29, -27, -26,
-24, -23, -21, -20, -19, -18, -18, -17,
diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index 79acf57..06ab9f2 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -43,7 +43,7 @@ int translat_code;
static int pas_intr_mask = 0;
static int pas_irq = 0;
-sound_os_info *pas_osp;
+static sound_os_info *pas_osp;
char pas_model;
static char *pas_model_names[] =
@@ -72,7 +72,7 @@ pas_write(u_char data, int ioaddr)
outb(ioaddr ^ translat_code, data);
}
-void
+static void
pas2_msg(char *foo)
{
printf(" PAS2: %s.\n", foo);
@@ -130,7 +130,7 @@ pas_remove_intr(int mask)
/******************* Begin of the Initialization Code ******************/
-int
+static int
config_pas_hw(struct address_info * hw_config)
{
char ok = 1;
@@ -271,7 +271,7 @@ config_pas_hw(struct address_info * hw_config)
return ok;
}
-int
+static int
detect_pas_hw(struct address_info * hw_config)
{
u_char board_id, foo;
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index 4831bd2..305ef45 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -246,7 +246,7 @@ pas_mixer_reset(void)
set_mode(P_M_MV508_LOUDNESS | P_M_MV508_ENHANCE_40);
}
-int
+static int
pas_mixer_ioctl(int dev, u_int cmd, ioctl_arg arg)
{
TRACE(printf("pas2_mixer.c: int pas_mixer_ioctl(u_int cmd = %X, u_int arg = %X)\n", cmd, arg));
diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c
index fd4d5c0..f2fc95c 100644
--- a/sys/i386/isa/sound/pas2_pcm.c
+++ b/sys/i386/isa/sound/pas2_pcm.c
@@ -55,7 +55,7 @@ static u_short pcm_bitsok = 8; /* mask of OK bits */
static int my_devnum = 0;
static int open_mode = 0;
-int
+static int
pcm_set_speed(int arg)
{
int foo, tmp;
@@ -114,7 +114,7 @@ pcm_set_speed(int arg)
return pcm_speed;
}
-int
+static int
pcm_set_channels(int arg)
{
@@ -131,7 +131,7 @@ pcm_set_channels(int arg)
return pcm_channels;
}
-int
+static int
pcm_set_bits(int arg)
{
if ((arg & pcm_bitsok) != arg)
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index f9d38e7..88d3fa1 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -53,10 +53,10 @@
int sbc_base = 0;
-int sbc_irq = 0;
+static int sbc_irq = 0;
static int open_mode = 0; /* Read, write or both */
int Jazz16_detected = 0;
-int sb_no_recording = 0;
+static int sb_no_recording = 0;
static int dsp_count = 0;
static int trigger_bits;
@@ -102,10 +102,10 @@ volatile int sb_intr_active = 0;
static int dsp_speed(int);
static int dsp_set_stereo(int mode);
static void sb_dsp_reset(int dev);
-sound_os_info *sb_osp = NULL;
+static sound_os_info *sb_osp = NULL;
#if defined(CONFIG_MIDI) || defined(CONFIG_AUDIO)
-void dsp_speaker(char state);
+static void dsp_speaker(char state);
/*
* Common code for the midi and pcm functions
@@ -218,7 +218,7 @@ sb_reset_dsp(void)
#ifdef CONFIG_AUDIO
-void
+static void
dsp_speaker(char state)
{
if (state)
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index a1d50bd..3d773be 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -53,12 +53,12 @@ extern int sb_dsp_highspeed;
extern volatile int sb_irq_mode;
extern int sb_duplex_midi;
extern int sb_intr_active;
-int input_opened = 0;
+static int input_opened = 0;
static int my_dev;
extern sound_os_info *sb_osp;
-void (*midi_input_intr) (int dev, u_char data);
+static void (*midi_input_intr) (int dev, u_char data);
static int
sb_midi_open(int dev, int mode, void (*input) (int dev, u_char data),
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index d6bd72d3..3639cf6 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -36,7 +36,7 @@
#include <i386/isa/sound/midi_ctrl.h>
-void seq_drain_midi_queues(void);
+static void seq_drain_midi_queues(void);
int
sequencer_poll (int dev, struct fileinfo *file, int events, select_table * wait);
static int sequencer_ok = 0;
@@ -68,9 +68,9 @@ static volatile struct snd_wait midi_sleep_flag = {0};
static int midi_opened[MAX_MIDI_DEV] = {0};
static int midi_written[MAX_MIDI_DEV] = {0};
-u_long prev_input_time = 0;
-int prev_event_time;
-u_long seq_time = 0;
+static u_long prev_input_time = 0;
+static int prev_event_time;
+static u_long seq_time = 0;
#include <i386/isa/sound/tuning.h>
@@ -1122,7 +1122,7 @@ sequencer_open(int dev, struct fileinfo * file)
return 0;
}
-void
+static void
seq_drain_midi_queues(void)
{
int i, n;
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 59311ca..c731730 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -71,10 +71,9 @@ audio_poll(int dev, struct fileinfo * file, int events, select_table * wait);
int
sequencer_poll (int dev, struct fileinfo *file, int events, select_table * wait);
-void sndintr __P((int unit));
-int sndprobe __P((struct isa_device *));
-int sndattach __P((struct isa_device *));
-int sndmmap __P((dev_t dev, int offset, int nprot ));
+static int sndprobe __P((struct isa_device *));
+static int sndattach __P((struct isa_device *));
+static int sndmmap __P((dev_t dev, int offset, int nprot ));
static d_open_t sndopen;
static d_close_t sndclose;
@@ -108,8 +107,8 @@ static void sound_mem_init(void);
*/
struct isa_driver opldriver = {sndprobe, sndattach, "opl"};
-struct isa_driver trixdriver = {sndprobe, sndattach, "trix"};
-struct isa_driver trixsbdriver = {sndprobe, sndattach, "trixsb"};
+static struct isa_driver trixdriver = {sndprobe, sndattach, "trix"};
+static struct isa_driver trixsbdriver = {sndprobe, sndattach, "trixsb"};
struct isa_driver sbdriver = {sndprobe, sndattach, "sb"};
struct isa_driver sbxvidriver = {sndprobe, sndattach, "sbxvi"};
struct isa_driver sbmididriver = {sndprobe, sndattach, "sbmidi"};
@@ -117,11 +116,11 @@ struct isa_driver awedriver = {sndprobe, sndattach, "awe"};
struct isa_driver pasdriver = {sndprobe, sndattach, "pas"};
struct isa_driver mpudriver = {sndprobe, sndattach, "mpu"};
struct isa_driver gusdriver = {sndprobe, sndattach, "gus"};
-struct isa_driver gusxvidriver = {sndprobe, sndattach, "gusxvi"};
-struct isa_driver gusmaxdriver = {sndprobe, sndattach, "gusmax"};
+static struct isa_driver gusxvidriver = {sndprobe, sndattach, "gusxvi"};
+static struct isa_driver gusmaxdriver = {sndprobe, sndattach, "gusmax"};
struct isa_driver uartdriver = {sndprobe, sndattach, "uart"};
struct isa_driver mssdriver = {sndprobe, sndattach, "mss"};
-struct isa_driver cssdriver = {sndprobe, sndattach, "css"};
+static struct isa_driver cssdriver = {sndprobe, sndattach, "css"};
struct isa_driver sscapedriver = {sndprobe, sndattach, "sscape"};
struct isa_driver sscape_mssdriver = {sndprobe, sndattach, "sscape_mss"};
@@ -140,7 +139,7 @@ get_time(void)
(u_long) timecopy.tv_sec * hz;
}
-int
+static int
sndmmap( dev_t dev, int offset, int nprot )
{
int unit;
@@ -337,7 +336,7 @@ static sound_os_info *temp_osp;
* The parameters from the config line are passed to the hw_config struct.
*/
-int
+static int
sndprobe(struct isa_device * dev)
{
struct address_info hw_config;
@@ -389,7 +388,7 @@ sndprobe(struct isa_device * dev)
return 0;
}
-int
+static int
sndattach(struct isa_device * dev)
{
int unit;
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 4b813ca..ca53452 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
- * $Id: spkr.c,v 1.30 1997/12/02 21:06:28 phk Exp $
+ * $Id: spkr.c,v 1.31 1998/01/24 02:54:25 eivind Exp $
*/
#include "speaker.h"
@@ -26,7 +26,7 @@
#ifdef DEVFS
#include <sys/devfsext.h>
-void *devfs_token;
+static void *devfs_token;
#endif
static d_open_t spkropen;
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 5a38841..b0938cc 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: stallion.c,v 1.14 1997/12/06 13:23:15 bde Exp $
+ * $Id: stallion.c,v 1.15 1997/12/16 17:40:09 eivind Exp $
*/
/*****************************************************************************/
@@ -434,8 +434,8 @@ static int stl_cd1400clkdivs[] = {
* externally visible functions.
*/
-int stlprobe(struct isa_device *idp);
-int stlattach(struct isa_device *idp);
+static int stlprobe(struct isa_device *idp);
+static int stlattach(struct isa_device *idp);
STATIC d_open_t stlopen;
STATIC d_close_t stlclose;
@@ -567,7 +567,7 @@ SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,stl_drvinit,NULL)
* they are done in the stlpciprobe() routine).
*/
-int stlprobe(struct isa_device *idp)
+static int stlprobe(struct isa_device *idp)
{
unsigned int status;
@@ -624,7 +624,7 @@ static int stl_findfreeunit()
* Allocate resources for and initialize the specified board.
*/
-int stlattach(struct isa_device *idp)
+static int stlattach(struct isa_device *idp)
{
stlbrd_t *brdp;
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 02e7df4..3548bc1 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -13,7 +13,7 @@
* all derivative works or modified versions.
*
* From: Version 1.9, Mon Oct 9 20:27:42 MSK 1995
- * $Id: wcd.c,v 1.49 1997/12/02 21:06:30 phk Exp $
+ * $Id: wcd.c,v 1.50 1998/01/24 02:54:27 eivind Exp $
*/
#include "wdc.h"
@@ -83,7 +83,7 @@ struct toc {
/*
* Volume size info.
*/
-struct volinfo {
+static struct volinfo {
u_long volsize; /* Volume size in blocks */
u_long blksize; /* Block size in bytes */
} info;
@@ -265,8 +265,8 @@ struct wcd {
#endif
};
-struct wcd *wcdtab[NUNIT]; /* Drive info by unit number */
-static int wcdnlun = 0; /* Number of configured drives */
+static struct wcd *wcdtab[NUNIT]; /* Drive info by unit number */
+static int wcdnlun = 0; /* Number of configured drives */
static struct wcd *wcd_init_lun(struct atapi *ata, int unit,
struct atapi_params *ap, int lun);
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 0250785..0683dba 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: wfd.c,v 1.5 1998/01/29 19:02:51 pst Exp $
+ * $Id: wfd.c,v 1.6 1998/02/01 21:57:49 bde Exp $
*/
/*
@@ -139,8 +139,8 @@ struct wfd {
struct diskslices *dk_slices; /* virtual drives */
};
-struct wfd *wfdtab[NUNIT]; /* Drive info by unit number */
-static int wfdnlun = 0; /* Number of configured drives */
+static struct wfd *wfdtab[NUNIT]; /* Drive info by unit number */
+static int wfdnlun = 0; /* Number of configured drives */
static void wfd_start (struct wfd *t);
static void wfd_done (struct wfd *t, struct buf *bp, int resid,
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index d52a556..66a104a 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: imgact_linux.c,v 1.24 1997/07/20 16:05:50 bde Exp $
+ * $Id: imgact_linux.c,v 1.25 1997/12/05 19:55:37 bde Exp $
*/
#include <sys/param.h>
@@ -53,9 +53,9 @@
#include <i386/linux/linux.h>
-extern int exec_linux_imgact __P((struct image_params *iparams));
+static int exec_linux_imgact __P((struct image_params *iparams));
-int
+static int
exec_linux_imgact(imgp)
struct image_params *imgp;
{
@@ -232,6 +232,6 @@ exec_linux_imgact(imgp)
* Since `const' objects end up in the text segment, TEXT_SET is the
* correct directive to use.
*/
-const struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" };
+static const struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" };
TEXT_SET(execsw_set, linux_execsw);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 3c60ca0..8c128ee 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: linux_sysvec.c,v 1.22 1998/02/04 22:32:28 eivind Exp $
+ * $Id: linux_sysvec.c,v 1.23 1998/02/06 12:13:19 eivind Exp $
*/
/* XXX we use functions that might not exist. */
@@ -56,10 +56,14 @@
#include <i386/linux/linux.h>
#include <i386/linux/linux_proto.h>
-int linux_fixup __P((int **stack_base, struct image_params *iparams));
-int elf_linux_fixup __P((int **stack_base, struct image_params *iparams));
-void linux_prepsyscall __P((struct trapframe *tf, int *args, u_int *code, caddr_t *params));
-void linux_sendsig __P((sig_t catcher, int sig, int mask, u_long code));
+static int linux_fixup __P((int **stack_base,
+ struct image_params *iparams));
+static int elf_linux_fixup __P((int **stack_base,
+ struct image_params *iparams));
+static void linux_prepsyscall __P((struct trapframe *tf, int *args,
+ u_int *code, caddr_t *params));
+static void linux_sendsig __P((sig_t catcher, int sig, int mask,
+ u_long code));
/*
* Linux syscalls return negative errno's, we do positive and map them
@@ -94,7 +98,8 @@ int linux_to_bsd_signal[LINUX_NSIG] = {
SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGURG, SIGURG, 0
};
-int linux_fixup(int **stack_base, struct image_params *imgp)
+static int
+linux_fixup(int **stack_base, struct image_params *imgp)
{
int *argv, *envp;
@@ -109,7 +114,8 @@ int linux_fixup(int **stack_base, struct image_params *imgp)
return 0;
}
-int elf_linux_fixup(int **stack_base, struct image_params *imgp)
+static int
+elf_linux_fixup(int **stack_base, struct image_params *imgp)
{
Elf32_Auxargs *args = (Elf32_Auxargs *)imgp->auxargs;
int *pos;
@@ -156,7 +162,7 @@ extern int _ucodesel, _udatasel;
* specified pc, psl.
*/
-void
+static void
linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
{
register struct proc *p = curproc;
@@ -349,7 +355,7 @@ linux_sigreturn(p, args)
return (EJUSTRETURN);
}
-void
+static void
linux_prepsyscall(struct trapframe *tf, int *args, u_int *code, caddr_t *params)
{
args[0] = tf->tf_ebx;
@@ -395,7 +401,7 @@ struct sysentvec elf_linux_sysvec = {
/*
* Installed either via SYSINIT() or via LKM stubs.
*/
-Elf32_Brandinfo linux_brand = {
+static Elf32_Brandinfo linux_brand = {
"Linux",
"/compat/linux",
"/lib/ld-linux.so.1",
OpenPOWER on IntegriCloud