openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppc: add missing static 

Add missing 'static' qualifiers.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Blue Swirl 2012-10-28 11:04:49 +00:00 committed by Stefan Hajnoczi
parent 71a8cdeca0
commit 434482925e
5 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/adb.c
View File

@ -108,10 +108,10 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
return olen; return olen;
} }
ADBDevice *adb_register_device(ADBBusState *s, int devaddr, static ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
ADBDeviceRequest *devreq, ADBDeviceRequest *devreq,
ADBDeviceReset *devreset, ADBDeviceReset *devreset,
void *opaque) void *opaque)
{ {
ADBDevice *d; ADBDevice *d;
if (s->nb_devices >= MAX_ADB_DEVICES) if (s->nb_devices >= MAX_ADB_DEVICES)

4
hw/adb.h
View File

@ -56,10 +56,6 @@ int adb_request(ADBBusState *s, uint8_t *buf_out,
const uint8_t *buf, int len); const uint8_t *buf, int len);
int adb_poll(ADBBusState *s, uint8_t *buf_out); 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_kbd_init(ADBBusState *bus);
void adb_mouse_init(ADBBusState *bus); void adb_mouse_init(ADBBusState *bus);

10
hw/nvram.h
View File

@ -10,17 +10,9 @@ typedef struct nvram_t {
nvram_write_t write_fn; nvram_write_t write_fn;
} nvram_t; } 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); 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); 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, int PPC_NVRAM_set_params (nvram_t *nvram, uint16_t NVRAM_size,
const char *arch, const char *arch,
uint32_t RAM_size, int boot_device, uint32_t RAM_size, int boot_device,

16
hw/ppc.c
View File

@ -721,7 +721,7 @@ static void cpu_ppc_hdecr_cb (void *opaque)
_cpu_ppc_store_hdecr(opaque, 0x00000000, 0xFFFFFFFF, 1); _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; 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); (*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); 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); 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, value >> 8);
nvram_write(nvram, addr + 1, value & 0xFF); 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; uint16_t tmp;
@ -1178,7 +1178,7 @@ uint16_t NVRAM_get_word (nvram_t *nvram, uint32_t addr)
return tmp; 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, value >> 24);
nvram_write(nvram, addr + 1, (value >> 16) & 0xFF); 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; return tmp;
} }
void NVRAM_set_string (nvram_t *nvram, uint32_t addr, static void NVRAM_set_string(nvram_t *nvram, uint32_t addr, const char *str,
const char *str, uint32_t max) uint32_t max)
{ {
int i; int i;

1
target-ppc/cpu.h
View File

@ -1177,7 +1177,6 @@ void cpu_ppc_store_decr (CPUPPCState *env, uint32_t value);
uint32_t cpu_ppc_load_hdecr (CPUPPCState *env); uint32_t cpu_ppc_load_hdecr (CPUPPCState *env);
void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_t value); void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_t value);
uint64_t cpu_ppc_load_purr (CPUPPCState *env); 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_rtcl (CPUPPCState *env);
uint32_t cpu_ppc601_load_rtcu (CPUPPCState *env); uint32_t cpu_ppc601_load_rtcu (CPUPPCState *env);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)