Commit 81b2d96b authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/m68k/mcf5208.c: Switch to transaction-based ptimer API 



Switch the mcf5208 code away from bottom-half based ptimers to
the new transaction-based ptimer API.  This just requires adding
begin/commit calls around the various places that modify the ptimer
state, and using the new ptimer_init() function to create the timer.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarThomas Huth <huth@tuxfamily.org>
Message-id: 20191017132905.5604-9-peter.maydell@linaro.org
parent 2cb42c93

hw/m68k/mcf5208.c

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qemu/error-report.h"

#include "qemu/main-loop.h"

#include "qapi/error.h"

#include "qemu-common.h"

#include "cpu.h"
@@ -79,6 +78,7 @@ static void m5208_timer_write(void *opaque, hwaddr offset, 
            return;

        }



        ptimer_transaction_begin(s->timer);

        if (s->pcsr & PCSR_EN)

            ptimer_stop(s->timer);
@@ -94,8 +94,10 @@ static void m5208_timer_write(void *opaque, hwaddr offset, 


        if (s->pcsr & PCSR_EN)

            ptimer_run(s->timer, 0);

        ptimer_transaction_commit(s->timer);

        break;

    case 2:

        ptimer_transaction_begin(s->timer);

        s->pmr = value;

        s->pcsr &= ~PCSR_PIF;

        if ((s->pcsr & PCSR_RLD) == 0) {
@@ -104,6 +106,7 @@ static void m5208_timer_write(void *opaque, hwaddr offset, 
        } else {

            ptimer_set_limit(s->timer, value, s->pcsr & PCSR_OVW);

        }

        ptimer_transaction_commit(s->timer);

        break;

    case 4:

        break;
@@ -182,7 +185,6 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic) 
{

    MemoryRegion *iomem = g_new(MemoryRegion, 1);

    m5208_timer_state *s;

    QEMUBH *bh;

    int i;



    /* SDRAMC.  */
@@ -191,8 +193,7 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic) 
    /* Timers.  */

    for (i = 0; i < 2; i++) {

        s = g_new0(m5208_timer_state, 1);

        bh = qemu_bh_new(m5208_timer_trigger, s);

        s->timer = ptimer_init_with_bh(bh, PTIMER_POLICY_DEFAULT);

        s->timer = ptimer_init(m5208_timer_trigger, s, PTIMER_POLICY_DEFAULT);

        memory_region_init_io(&s->iomem, NULL, &m5208_timer_ops, s,

                              "m5208-timer", 0x00004000);

        memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i,