Re: [Qemu-devel] [PATCH 5/6] cris: Remove the CRIS PIC glue

[Peter Crosthwaite]

On Sun, Feb 2, 2014 at 1:04 PM,  <address@hidden> wrote:
> From: "Edgar E. Iglesias" <address@hidden>
>
> Signed-off-by: Edgar E. Iglesias <address@hidden>

Reviewed-by: Peter Crosthwaite <address@hidden>

> ---
>  hw/cris/Makefile.objs     |  1 -
>  hw/cris/pic_cpu.c         | 47 
> -----------------------------------------------
>  include/hw/cris/etraxfs.h |  2 --
>  3 files changed, 50 deletions(-)
>  delete mode 100644 hw/cris/pic_cpu.c
>
> diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs
> index 776db7c..7624173 100644
> --- a/hw/cris/Makefile.objs
> +++ b/hw/cris/Makefile.objs
> @@ -1,3 +1,2 @@
> -obj-y += pic_cpu.o
>  obj-y += boot.o
>  obj-y += axis_dev88.o
> diff --git a/hw/cris/pic_cpu.c b/hw/cris/pic_cpu.c
> deleted file mode 100644
> index bd47bf1..0000000
> --- a/hw/cris/pic_cpu.c
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -/*
> - * QEMU CRIS CPU interrupt wrapper logic.
> - *
> - * Copyright (c) 2009 Edgar E. Iglesias, Axis Communications AB.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a 
> copy
> - * of this software and associated documentation files (the "Software"), to 
> deal
> - * in the Software without restriction, including without limitation the 
> rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
> FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -
> -#include "hw/sysbus.h"
> -#include "hw/hw.h"
> -#include "hw/cris/etraxfs.h"
> -
> -#define D(x)
> -
> -static void cris_pic_cpu_handler(void *opaque, int irq, int level)
> -{
> -    CRISCPU *cpu = opaque;
> -    CPUState *cs = CPU(cpu);
> -    int type = irq ? CPU_INTERRUPT_NMI : CPU_INTERRUPT_HARD;
> -
> -    if (level) {
> -        cpu_interrupt(cs, type);
> -    } else {
> -        cpu_reset_interrupt(cs, type);
> -    }
> -}
> -
> -qemu_irq *cris_pic_init_cpu(CPUCRISState *env)
> -{
> -    return qemu_allocate_irqs(cris_pic_cpu_handler, cris_env_get_cpu(env), 
> 2);
> -}
> diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h
> index ab30559..73a6134 100644
> --- a/include/hw/cris/etraxfs.h
> +++ b/include/hw/cris/etraxfs.h
> @@ -28,8 +28,6 @@
>  #include "net/net.h"
>  #include "hw/cris/etraxfs_dma.h"
>
> -qemu_irq *cris_pic_init_cpu(CPUCRISState *env);
> -
>  /* Instantiate an ETRAXFS Ethernet MAC.  */
>  static inline DeviceState *
>  etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
> --
> 1.8.3.2
>
>