Am 22.12.2011 19:20, schrieb Mark Langsdorf:
> Use qdev properties to allow board modelers to set the frequencies
> for the sp804 timer. Each of the sp804's timers can have an
> individual frequency. The timers default to 1MHz.
>
> Signed-off-by: Mark Langsdorf <mark.langsd...@calxeda.com>
> ---
> Changes from v1
> Simplified multiple timer frequency handling
> Removed the shared default
> hw/arm_timer.c | 26 +++++++++++++++++++++-----
> 1 files changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm_timer.c b/hw/arm_timer.c
> index 0a5b9d2..d2738c7 100644
> --- a/hw/arm_timer.c
> +++ b/hw/arm_timer.c
> @@ -178,6 +180,7 @@ typedef struct {
> SysBusDevice busdev;
> MemoryRegion iomem;
> arm_timer_state *timer[2];
> + int freq0, freq1;
> int level[2];
> qemu_irq irq;
> } sp804_state;
> @@ -281,6 +287,16 @@ static int sp804_init(SysBusDevice *dev)
> return 0;
> }
>
> +static SysBusDeviceInfo sp804_info = {
> + .init = sp804_init,
> + .qdev.name = "sp804",
> + .qdev.size = sizeof(sp804_state),
> + .qdev.props = (Property[]) {
> + DEFINE_PROP_INT32("freq0", sp804_state, freq0, 1000000),
> + DEFINE_PROP_INT32("freq1", sp804_state, freq1, 1000000),
Since you're using INT32 here, please declare it as int32_t above.
Or uint32_t and UINT32 if there's no negative frequency.
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
