misc: Replace 'struct QEMUTimer' by 'QEMUTimer'

Most code already used QEMUTimer without the redundant 'struct' keyword.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Stefan Weil 2013-12-01 08:49:47 +01:00 committed by Michael Tokarev
parent 47908a0f66
commit 1246b259f8
12 changed files with 19 additions and 19 deletions

View File

@ -120,8 +120,8 @@ typedef struct {
uint64_t char_tx_time; uint64_t char_tx_time;
CharDriverState *chr; CharDriverState *chr;
qemu_irq irq; qemu_irq irq;
struct QEMUTimer *fifo_trigger_handle; QEMUTimer *fifo_trigger_handle;
struct QEMUTimer *tx_time_handle; QEMUTimer *tx_time_handle;
} UartState; } UartState;
static void uart_update_status(UartState *s) static void uart_update_status(UartState *s)

View File

@ -684,7 +684,7 @@ static inline void cpu_ppc_hdecr_excp(PowerPCCPU *cpu)
} }
static void __cpu_ppc_store_decr(PowerPCCPU *cpu, uint64_t *nextp, static void __cpu_ppc_store_decr(PowerPCCPU *cpu, uint64_t *nextp,
struct QEMUTimer *timer, QEMUTimer *timer,
void (*raise_excp)(PowerPCCPU *), void (*raise_excp)(PowerPCCPU *),
uint32_t decr, uint32_t value, uint32_t decr, uint32_t value,
int is_excp) int is_excp)
@ -856,9 +856,9 @@ typedef struct ppc40x_timer_t ppc40x_timer_t;
struct ppc40x_timer_t { struct ppc40x_timer_t {
uint64_t pit_reload; /* PIT auto-reload value */ uint64_t pit_reload; /* PIT auto-reload value */
uint64_t fit_next; /* Tick for next FIT interrupt */ uint64_t fit_next; /* Tick for next FIT interrupt */
struct QEMUTimer *fit_timer; QEMUTimer *fit_timer;
uint64_t wdt_next; /* Tick for next WDT interrupt */ uint64_t wdt_next; /* Tick for next WDT interrupt */
struct QEMUTimer *wdt_timer; QEMUTimer *wdt_timer;
/* 405 have the PIT, 440 have a DECR. */ /* 405 have the PIT, 440 have a DECR. */
unsigned int decr_excp; unsigned int decr_excp;

View File

@ -1234,7 +1234,7 @@ struct ppc4xx_gpt_t {
MemoryRegion iomem; MemoryRegion iomem;
int64_t tb_offset; int64_t tb_offset;
uint32_t tb_freq; uint32_t tb_freq;
struct QEMUTimer *timer; QEMUTimer *timer;
qemu_irq irqs[5]; qemu_irq irqs[5];
uint32_t oe; uint32_t oe;
uint32_t ol; uint32_t ol;

View File

@ -64,10 +64,10 @@ typedef struct booke_timer_t booke_timer_t;
struct booke_timer_t { struct booke_timer_t {
uint64_t fit_next; uint64_t fit_next;
struct QEMUTimer *fit_timer; QEMUTimer *fit_timer;
uint64_t wdt_next; uint64_t wdt_next;
struct QEMUTimer *wdt_timer; QEMUTimer *wdt_timer;
uint32_t flags; uint32_t flags;
}; };

View File

@ -61,8 +61,8 @@ struct M48t59State {
time_t stop_time; time_t stop_time;
/* Alarm & watchdog */ /* Alarm & watchdog */
struct tm alarm; struct tm alarm;
struct QEMUTimer *alrm_timer; QEMUTimer *alrm_timer;
struct QEMUTimer *wd_timer; QEMUTimer *wd_timer;
/* NVRAM storage */ /* NVRAM storage */
uint8_t *buffer; uint8_t *buffer;
/* Model parameters */ /* Model parameters */

View File

@ -65,13 +65,13 @@ struct SerialState {
/* Interrupt trigger level for recv_fifo */ /* Interrupt trigger level for recv_fifo */
uint8_t recv_fifo_itl; uint8_t recv_fifo_itl;
struct QEMUTimer *fifo_timeout_timer; QEMUTimer *fifo_timeout_timer;
int timeout_ipending; /* timeout interrupt pending state */ int timeout_ipending; /* timeout interrupt pending state */
uint64_t char_transmit_time; /* time to transmit a char in ticks */ uint64_t char_transmit_time; /* time to transmit a char in ticks */
int poll_msl; int poll_msl;
struct QEMUTimer *modem_status_poll; QEMUTimer *modem_status_poll;
MemoryRegion io; MemoryRegion io;
}; };

View File

@ -24,10 +24,10 @@ struct ppc_tb_t {
/* Decrementer management */ /* Decrementer management */
uint64_t decr_next; /* Tick for next decr interrupt */ uint64_t decr_next; /* Tick for next decr interrupt */
uint32_t decr_freq; /* decrementer frequency */ uint32_t decr_freq; /* decrementer frequency */
struct QEMUTimer *decr_timer; QEMUTimer *decr_timer;
/* Hypervisor decrementer management */ /* Hypervisor decrementer management */
uint64_t hdecr_next; /* Tick for next hdecr interrupt */ uint64_t hdecr_next; /* Tick for next hdecr interrupt */
struct QEMUTimer *hdecr_timer; QEMUTimer *hdecr_timer;
uint64_t purr_load; uint64_t purr_load;
uint64_t purr_start; uint64_t purr_start;
void *opaque; void *opaque;

View File

@ -62,7 +62,7 @@ typedef struct AlphaCPU {
CPUAlphaState env; CPUAlphaState env;
/* This alarm doesn't exist in real hardware; we wish it did. */ /* This alarm doesn't exist in real hardware; we wish it did. */
struct QEMUTimer *alarm_timer; QEMUTimer *alarm_timer;
} AlphaCPU; } AlphaCPU;
static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env)

View File

@ -476,7 +476,7 @@ struct CPUMIPSState {
const mips_def_t *cpu_model; const mips_def_t *cpu_model;
void *irq[8]; void *irq[8];
struct QEMUTimer *timer; /* Internal timer */ QEMUTimer *timer; /* Internal timer */
}; };
#include "cpu-qom.h" #include "cpu-qom.h"

View File

@ -307,7 +307,7 @@ typedef struct CPUOpenRISCState {
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
CPUOpenRISCTLBContext * tlb; CPUOpenRISCTLBContext * tlb;
struct QEMUTimer *timer; QEMUTimer *timer;
uint32_t ttmr; /* Timer tick mode register */ uint32_t ttmr; /* Timer tick mode register */
uint32_t ttcr; /* Timer tick count register */ uint32_t ttcr; /* Timer tick count register */

View File

@ -370,7 +370,7 @@ struct CPUTimer
uint32_t disabled; uint32_t disabled;
uint64_t disabled_mask; uint64_t disabled_mask;
int64_t clock_offset; int64_t clock_offset;
struct QEMUTimer *qtimer; QEMUTimer *qtimer;
}; };
typedef struct CPUTimer CPUTimer; typedef struct CPUTimer CPUTimer;

View File

@ -161,7 +161,7 @@ struct QemuConsole {
}; };
struct DisplayState { struct DisplayState {
struct QEMUTimer *gui_timer; QEMUTimer *gui_timer;
uint64_t last_update; uint64_t last_update;
uint64_t update_interval; uint64_t update_interval;
bool refreshing; bool refreshing;