Commit 661f1929 authored by Jan Kiszka's avatar Jan Kiszka Committed by Blue Swirl
Browse files

monitor: Restrict pic/irq_info to supporting targets 



This allows to drop various stubs and move the i8359 into hwlib.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 81a02f93

hw/an5206.c

+0 −10
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 */



#include "hw.h"

#include "pc.h"

#include "mcf.h"

#include "boards.h"

#include "loader.h"
@@ -18,15 +17,6 @@ 
#define AN5206_MBAR_ADDR 0x10000000

#define AN5206_RAMBAR_ADDR 0x20000000



/* Stub functions for hardware that doesn't exist.  */

void pic_info(Monitor *mon)

{

}



void irq_info(Monitor *mon)

{

}



/* Board init.  */



static void an5206_init(ram_addr_t ram_size,

hw/arm_pic.c

+0 −11
Original line number Diff line number Diff line
@@ -8,19 +8,8 @@ 
 */



#include "hw.h"

#include "pc.h"

#include "arm-misc.h"



/* Stub functions for hardware that doesn't exist.  */

void pic_info(Monitor *mon)

{

}



void irq_info(Monitor *mon)

{

}





/* Input 0 is IRQ and input 1 is FIQ.  */

static void arm_pic_cpu_handler(void *opaque, int irq, int level)

{

hw/cris_pic_cpu.c

+0 −6
Original line number Diff line number Diff line
@@ -24,16 +24,10 @@ 


#include "sysbus.h"

#include "hw.h"

#include "pc.h"

#include "etraxfs.h"



#define D(x)



void pic_info(Monitor *mon)

{}

void irq_info(Monitor *mon)

{}



static void cris_pic_cpu_handler(void *opaque, int irq, int level)

{

    CPUState *env = (CPUState *)opaque;

hw/etraxfs.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 * THE SOFTWARE.

 */



#include "net.h"

#include "etraxfs_dma.h"



qemu_irq *cris_pic_init_cpu(CPUState *env);

hw/lm32_pic.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct LM32PicState { 
typedef struct LM32PicState LM32PicState;



static LM32PicState *pic;

void pic_info(Monitor *mon)

void lm32_do_pic_info(Monitor *mon)

{

    if (pic == NULL) {

        return;
@@ -49,7 +49,7 @@ void pic_info(Monitor *mon) 
            pic->im, pic->ip, pic->irq_state);

}



void irq_info(Monitor *mon)

void lm32_irq_info(Monitor *mon)

{

    int i;

    uint32_t count;