summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-09-05 21:14:08 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-09-05 21:14:08 +0000
commitf8523e2ebf0b04630bfd32a637ecb1b32aa133b3 (patch)
treeaa297d79487fbe7290c2a063122fbd5eea808fde
parent0d014dea44612316aed2ff47e882601e7a05e885 (diff)
Do not make ip22_{slow,fast}_mode() public anymore.
-rw-r--r--sys/arch/sgi/sgi/ip22.h6
-rw-r--r--sys/arch/sgi/sgi/ip22_machdep.c20
2 files changed, 6 insertions, 20 deletions
diff --git a/sys/arch/sgi/sgi/ip22.h b/sys/arch/sgi/sgi/ip22.h
index 8885c0c4512..2931e2ef238 100644
--- a/sys/arch/sgi/sgi/ip22.h
+++ b/sys/arch/sgi/sgi/ip22.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip22.h,v 1.9 2014/07/17 19:51:58 miod Exp $ */
+/* $OpenBSD: ip22.h,v 1.10 2015/09/05 21:14:07 miod Exp $ */
/*
* Copyright (c) 2012 Miodrag Vallat.
@@ -41,9 +41,5 @@ extern int hpc_old; /* nonzero if at least one HPC 1.x device found */
extern int bios_year;
extern int ip22_ecc; /* nonzero if runinng with an ECC memory system */
-int ip22_fast_mode(void);
-int ip22_slow_mode(void);
-int ip22_restore_mode(int);
-
void ip22_ConfigCache(struct cpu_info *);
extern void (*ip22_extsync)(struct cpu_info *, paddr_t, size_t, int);
diff --git a/sys/arch/sgi/sgi/ip22_machdep.c b/sys/arch/sgi/sgi/ip22_machdep.c
index 00c5da60322..85b987323f4 100644
--- a/sys/arch/sgi/sgi/ip22_machdep.c
+++ b/sys/arch/sgi/sgi/ip22_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip22_machdep.c,v 1.20 2014/07/17 19:51:58 miod Exp $ */
+/* $OpenBSD: ip22_machdep.c,v 1.21 2015/09/05 21:14:07 miod Exp $ */
/*
* Copyright (c) 2012 Miodrag Vallat.
@@ -70,7 +70,9 @@ void ip22_cache_halt(int);
void ip22_cache_sync(struct cpu_info *, paddr_t, size_t, int);
void ip22_ecc_halt(int);
void ip22_ecc_init(int);
+void ip22_fast_mode(void);
void ip22_memory_setup(void);
+void ip22_slow_mode(void);
void ip22_video_setup(void);
/*
@@ -635,7 +637,7 @@ ip22_ecc_unmap(uint32_t omemc1)
mips_sync();
}
-int
+void
ip22_fast_mode()
{
register uint32_t memc1;
@@ -652,13 +654,10 @@ ip22_fast_mode()
/* if (sys_config.system_type == SGI_IP26) */
tcc_prefetch_enable();
#endif
- return 0;
}
-
- return 1;
}
-int
+void
ip22_slow_mode()
{
register uint32_t memc1;
@@ -675,16 +674,7 @@ ip22_slow_mode()
(void)imc_read(IMC_MEMCFG1);
ip22_ecc_unmap(memc1);
ip22_ecc_mode = 0;
- return 1;
}
-
- return 0;
-}
-
-int
-ip22_restore_mode(int mode)
-{
- return mode ? ip22_fast_mode() : ip22_slow_mode();
}
void