Commit bb3d5ea8 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/isa: Move parallel_hds_isa_init() to hw/char/parallel-isa.c 



Again... (after 07dc7880 and 9157eee1).

We now extract the ISA bus specific helpers.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-2-f4bug@amsat.org>
Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a40161cb

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ M: Michael S. Tsirkin <mst@redhat.com> 
M: Paolo Bonzini <pbonzini@redhat.com>

S: Supported

F: hw/char/debugcon.c

F: hw/char/parallel.c

F: hw/char/parallel*

F: hw/char/serial*

F: hw/dma/i8257*

F: hw/i2c/pm_smbus.c
@@ -939,6 +939,7 @@ F: hw/timer/i8254* 
F: hw/timer/mc146818rtc*

F: hw/watchdog/wdt_ib700.c

F: include/hw/display/vga.h

F: include/hw/char/parallel.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/isa/i8257.h

F: include/hw/timer/hpet.h

hw/char/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-$(CONFIG_IPACK) += ipoctal232.o

common-obj-$(CONFIG_ESCC) += escc.o

common-obj-$(CONFIG_PARALLEL) += parallel.o

common-obj-$(CONFIG_PARALLEL) += parallel-isa.o

common-obj-$(CONFIG_PL011) += pl011.o

common-obj-$(CONFIG_SERIAL) += serial.o

common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o

hw/char/parallel-isa.c

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * QEMU Parallel PORT (ISA bus helpers)

 *

 * Copyright (c) 2003 Fabrice Bellard

 *

 * SPDX-License-Identifier: MIT

 */

#include "qemu/osdep.h"

#include "sysemu/sysemu.h"

#include "hw/isa/isa.h"

#include "hw/char/parallel.h"



static void parallel_init(ISABus *bus, int index, Chardev *chr)

{

    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, "isa-parallel");

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "index", index);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

}



void parallel_hds_isa_init(ISABus *bus, int n)

{

    int i;



    assert(n <= MAX_PARALLEL_PORTS);



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

        if (parallel_hds[i]) {

            parallel_init(bus, i, parallel_hds[i]);

        }

    }

}

hw/char/parallel.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "chardev/char-parallel.h"

#include "chardev/char-fe.h"

#include "hw/isa/isa.h"

#include "hw/i386/pc.h"

#include "hw/char/parallel.h"

#include "sysemu/sysemu.h"



//#define DEBUG_PARALLEL

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/char/serial.h"

#include "hw/char/parallel.h"

#include "hw/i386/apic.h"

#include "hw/i386/topology.h"

#include "sysemu/cpus.h"