[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] ppc: add missing static
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 6/9] ppc: add missing static |
Date: |
Thu, 1 Nov 2012 20:05:50 +0100 |
From: Blue Swirl <address@hidden>
Add missing 'static' qualifiers.
Signed-off-by: Blue Swirl <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/adb.c | 8 ++++----
hw/adb.h | 4 ----
hw/nvram.h | 10 +---------
hw/ppc.c | 16 ++++++++--------
target-ppc/cpu.h | 1 -
5 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/hw/adb.c b/hw/adb.c
index aa15f55..3b547f0 100644
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -108,10 +108,10 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
return olen;
}
-ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
- ADBDeviceRequest *devreq,
- ADBDeviceReset *devreset,
- void *opaque)
+static ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
+ ADBDeviceRequest *devreq,
+ ADBDeviceReset *devreset,
+ void *opaque)
{
ADBDevice *d;
if (s->nb_devices >= MAX_ADB_DEVICES)
diff --git a/hw/adb.h b/hw/adb.h
index b2a591c..5b27da2 100644
--- a/hw/adb.h
+++ b/hw/adb.h
@@ -56,10 +56,6 @@ int adb_request(ADBBusState *s, uint8_t *buf_out,
const uint8_t *buf, int len);
int adb_poll(ADBBusState *s, uint8_t *buf_out);
-ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
- ADBDeviceRequest *devreq,
- ADBDeviceReset *devreset,
- void *opaque);
void adb_kbd_init(ADBBusState *bus);
void adb_mouse_init(ADBBusState *bus);
diff --git a/hw/nvram.h b/hw/nvram.h
index a4a1db4..72363ce 100644
--- a/hw/nvram.h
+++ b/hw/nvram.h
@@ -10,17 +10,9 @@ typedef struct nvram_t {
nvram_write_t write_fn;
} nvram_t;
-void NVRAM_set_byte (nvram_t *nvram, uint32_t addr, uint8_t value);
-uint8_t NVRAM_get_byte (nvram_t *nvram, uint32_t addr);
-void NVRAM_set_word (nvram_t *nvram, uint32_t addr, uint16_t value);
-uint16_t NVRAM_get_word (nvram_t *nvram, uint32_t addr);
-void NVRAM_set_lword (nvram_t *nvram, uint32_t addr, uint32_t value);
uint32_t NVRAM_get_lword (nvram_t *nvram, uint32_t addr);
-void NVRAM_set_string (nvram_t *nvram, uint32_t addr,
- const char *str, uint32_t max);
int NVRAM_get_string (nvram_t *nvram, uint8_t *dst, uint16_t addr, int max);
-void NVRAM_set_crc (nvram_t *nvram, uint32_t addr,
- uint32_t start, uint32_t count);
+
int PPC_NVRAM_set_params (nvram_t *nvram, uint16_t NVRAM_size,
const char *arch,
uint32_t RAM_size, int boot_device,
diff --git a/hw/ppc.c b/hw/ppc.c
index 98546de..e4a0a3e 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -721,7 +721,7 @@ static void cpu_ppc_hdecr_cb (void *opaque)
_cpu_ppc_store_hdecr(opaque, 0x00000000, 0xFFFFFFFF, 1);
}
-void cpu_ppc_store_purr (CPUPPCState *env, uint64_t value)
+static void cpu_ppc_store_purr(CPUPPCState *env, uint64_t value)
{
ppc_tb_t *tb_env = env->tb_env;
@@ -1152,23 +1152,23 @@ static inline void nvram_write (nvram_t *nvram,
uint32_t addr, uint32_t val)
(*nvram->write_fn)(nvram->opaque, addr, val);
}
-void NVRAM_set_byte (nvram_t *nvram, uint32_t addr, uint8_t value)
+static void NVRAM_set_byte(nvram_t *nvram, uint32_t addr, uint8_t value)
{
nvram_write(nvram, addr, value);
}
-uint8_t NVRAM_get_byte (nvram_t *nvram, uint32_t addr)
+static uint8_t NVRAM_get_byte(nvram_t *nvram, uint32_t addr)
{
return nvram_read(nvram, addr);
}
-void NVRAM_set_word (nvram_t *nvram, uint32_t addr, uint16_t value)
+static void NVRAM_set_word(nvram_t *nvram, uint32_t addr, uint16_t value)
{
nvram_write(nvram, addr, value >> 8);
nvram_write(nvram, addr + 1, value & 0xFF);
}
-uint16_t NVRAM_get_word (nvram_t *nvram, uint32_t addr)
+static uint16_t NVRAM_get_word(nvram_t *nvram, uint32_t addr)
{
uint16_t tmp;
@@ -1178,7 +1178,7 @@ uint16_t NVRAM_get_word (nvram_t *nvram, uint32_t addr)
return tmp;
}
-void NVRAM_set_lword (nvram_t *nvram, uint32_t addr, uint32_t value)
+static void NVRAM_set_lword(nvram_t *nvram, uint32_t addr, uint32_t value)
{
nvram_write(nvram, addr, value >> 24);
nvram_write(nvram, addr + 1, (value >> 16) & 0xFF);
@@ -1198,8 +1198,8 @@ uint32_t NVRAM_get_lword (nvram_t *nvram, uint32_t addr)
return tmp;
}
-void NVRAM_set_string (nvram_t *nvram, uint32_t addr,
- const char *str, uint32_t max)
+static void NVRAM_set_string(nvram_t *nvram, uint32_t addr, const char *str,
+ uint32_t max)
{
int i;
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 286f42a..ddee9a0 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1177,7 +1177,6 @@ void cpu_ppc_store_decr (CPUPPCState *env, uint32_t
value);
uint32_t cpu_ppc_load_hdecr (CPUPPCState *env);
void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_t value);
uint64_t cpu_ppc_load_purr (CPUPPCState *env);
-void cpu_ppc_store_purr (CPUPPCState *env, uint64_t value);
uint32_t cpu_ppc601_load_rtcl (CPUPPCState *env);
uint32_t cpu_ppc601_load_rtcu (CPUPPCState *env);
#if !defined(CONFIG_USER_ONLY)
--
1.7.12.1
- [Qemu-devel] [PATCH 1/9] cadence_uart: More debug information, (continued)
- [Qemu-devel] [PATCH 1/9] cadence_uart: More debug information, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 2/6] targphys.h: Don't define target_phys_addr_t for user-mode emulators, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 2/9] m68k: Return semihosting errno values correctly, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 1/6] ui/vnc: Only report/use TIGHT_PNG encoding if enabled., Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 3/6] target-arm/neon_helper: Remove obsolete FIXME comment, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 3/9] target-sparc: make do_unaligned_access static, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 4/6] configure: Remove unused parameters from main function, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 4/9] vl.c: add missing static, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 5/6] net/tap-win32: Fix compiler warning caused by missing include statement, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 5/9] vnc: add missing static, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 6/9] ppc: add missing static,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 6/6] ui/vnc-jobs.c: Fix minor typos in comments, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 7/9] target-ppc: make some functions static, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 9/9] pc: Drop redundant test for ROM memory region, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 8/9] exec: make some functions static, Stefan Hajnoczi, 2012/11/01
- Re: [Qemu-devel] [PULL 1.3 0/9] Trivial patches for 20 October to 1 November 2012, Blue Swirl, 2012/11/03