Commit 89ea03a7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/m68k-pull-2019-09-07' into staging 



Add the m68k next-cube machine

# gpg: Signature made Sat 07 Sep 2019 16:32:53 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "huth@tuxfamily.org"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/m68k-pull-2019-09-07:
  .travis.yml: Let the avocado job run the NeXTcube tests
  tests/acceptance: Add test of NeXTcube framebuffer using OCR
  m68k: Add an entry for the NeXTcube machine to the MAINTAINERS file
  m68k: Add serial controller to the NeXTcube machine
  escc: introduce a selector for the register bit
  m68k: Add NeXTcube machine
  m68k: Add NeXTcube keyboard device
  m68k: Add NeXTcube framebuffer device emulation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 019217c3 25311649

.travis.yml

+6 −1
Original line number Diff line number Diff line
@@ -232,15 +232,20 @@ matrix: 


    # Acceptance (Functional) tests

    - env:

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc64-softmmu"

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc64-softmmu,m68k-softmmu"

        - TEST_CMD="make check-acceptance"

      after_failure:

        - cat tests/results/latest/job.log

      addons:

        apt:

          packages:

            - python3-pil

            - python3-pip

            - python3.5-venv

            - tesseract-ocr

            - tesseract-ocr-eng





    # Using newer GCC with sanitizers

    - addons:

        apt:

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -910,6 +910,13 @@ F: hw/char/mcf_uart.c 
F: hw/net/mcf_fec.c

F: include/hw/m68k/mcf*.h



NeXTcube

M: Thomas Huth <huth@tuxfamily.org>

S: Odd Fixes

F: hw/m68k/next-*.c

F: hw/display/next-fb.c

F: include/hw/m68k/next-cube.h



MicroBlaze Machines

-------------------

petalogix_s3adsp1800

default-configs/m68k-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ CONFIG_SEMIHOSTING=y 
#

CONFIG_AN5206=y

CONFIG_MCF5208=y

CONFIG_NEXTCUBE=y

hw/char/escc.c

+24 −6
Original line number Diff line number Diff line
@@ -45,14 +45,21 @@ 
 * mouse and keyboard ports don't implement all functions and they are

 * only asynchronous. There is no DMA.

 *

 * Z85C30 is also used on PowerMacs. There are some small differences

 * between Sparc version (sunzilog) and PowerMac (pmac):

 * Z85C30 is also used on PowerMacs and m68k Macs.

 *

 * There are some small differences between Sparc version (sunzilog)

 * and PowerMac (pmac):

 *  Offset between control and data registers

 *  There is some kind of lockup bug, but we can ignore it

 *  CTS is inverted

 *  DMA on pmac using DBDMA chip

 *  pmac can do IRDA and faster rates, sunzilog can only do 38400

 *  pmac baud rate generator clock is 3.6864 MHz, sunzilog 4.9152 MHz

 *

 * Linux driver for m68k Macs is the same as for PowerMac (pmac_zilog),

 * but registers are grouped by type and not by channel:

 * channel is selected by bit 0 of the address (instead of bit 1)

 * and register is selected by bit 1 of the address (instead of bit 0).

 */



/*
@@ -172,6 +179,16 @@ static void handle_kbd_command(ESCCChannelState *s, int val); 
static int serial_can_receive(void *opaque);

static void serial_receive_byte(ESCCChannelState *s, int ch);



static int reg_shift(ESCCState *s)

{

    return s->bit_swap ? s->it_shift + 1 : s->it_shift;

}



static int chn_shift(ESCCState *s)

{

    return s->bit_swap ? s->it_shift : s->it_shift + 1;

}



static void clear_queue(void *opaque)

{

    ESCCChannelState *s = opaque;
@@ -436,8 +453,8 @@ static void escc_mem_write(void *opaque, hwaddr addr, 
    int newreg, channel;



    val &= 0xff;

    saddr = (addr >> serial->it_shift) & 1;

    channel = (addr >> (serial->it_shift + 1)) & 1;

    saddr = (addr >> reg_shift(serial)) & 1;

    channel = (addr >> chn_shift(serial)) & 1;

    s = &serial->chn[channel];

    switch (saddr) {

    case SERIAL_CTRL:
@@ -547,8 +564,8 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr, 
    uint32_t ret;

    int channel;



    saddr = (addr >> serial->it_shift) & 1;

    channel = (addr >> (serial->it_shift + 1)) & 1;

    saddr = (addr >> reg_shift(serial)) & 1;

    channel = (addr >> chn_shift(serial)) & 1;

    s = &serial->chn[channel];

    switch (saddr) {

    case SERIAL_CTRL:
@@ -832,6 +849,7 @@ static void escc_realize(DeviceState *dev, Error **errp) 
static Property escc_properties[] = {

    DEFINE_PROP_UINT32("frequency", ESCCState, frequency,   0),

    DEFINE_PROP_UINT32("it_shift",  ESCCState, it_shift,    0),

    DEFINE_PROP_BOOL("bit_swap",    ESCCState, bit_swap,    false),

    DEFINE_PROP_UINT32("disabled",  ESCCState, disabled,    0),

    DEFINE_PROP_UINT32("chnBtype",  ESCCState, chn[0].type, 0),

    DEFINE_PROP_UINT32("chnAtype",  ESCCState, chn[1].type, 0),

hw/display/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ common-obj-$(CONFIG_RASPI) += bcm2835_fb.o 
common-obj-$(CONFIG_SM501) += sm501.o

common-obj-$(CONFIG_TCX) += tcx.o

common-obj-$(CONFIG_CG3) += cg3.o

common-obj-$(CONFIG_NEXTCUBE) += next-fb.o



obj-$(CONFIG_VGA) += vga.o