Skip to content

Commit

Permalink
Initial commit of new Amiga 4000 system (WIP)
Browse files Browse the repository at this point in the history
New Amiga 4000 machine type, including AGA chipset emulation.
A4000 IDE support is implemented, but not 3.5" floppy emulation (yet).
The default system type is PAL, with an "ntsc" machine option boolean.
The mouse is on port 1 and there's no joystick support (yet).

The code doesn't work yet but it should at least compile.
I hope to complete the project over the next several weeks.
The following are the release notes for the planed 1.0 release.

The left-Amiga key is mapped to left-Meta (aka left-Windows key).
The right-Amiga key is mapped to right-Ctrl, right-Meta, and Menu,
to accommodate keyboards which may only have one of those keys.
The End key (and Help, if present) are mapped to Help, and the
Home and PgUp keys map to numeric keypad left and right parens.
PgDn is mapped to the international key left of Return, and both
Insert and the angle brackets key, if present, are mapped to the
angle brackets key to the right of left Shift. The optional A3000
10-second warm reset warning for Ctrl-Amiga-Amiga is implemented.
Mouse wheel events are sent through keyboard scancodes as well.

Planned features:
 - floppy disk images, including .adf and MS-DOS 720K/1.44M formats
 - optimized screen refresh mode for low-bandwidth remote connections
 - SCSI support (emulating Amiga 4000T built-in controller)
 - RS-232 serial (Paula) and parallel printer (CIAs) ports
 - Zorro II/III bus support (including INT2 and INT6 GPIO lines)
 - A2065 Ethernet support (use existing QEMU Lance Ethernet)
 - Zorro expansion RAM (up to 2GB, vs. 64MB motherboard RAM)
 - Picasso II/IV or other supported RTG-compatible graphics card
 - USB gamepad (and second mouse support if possible)
 - configurable stereo separation and Amiga low-pass audio filter
 - interface to real Amiga devices via Raspberry Pi GPIO lines
 - PCI bus interface and virtio devices (with AmigaOS support)

Three aspects of the A4000 have been intentionally left unimplemented.
The power-on overlay of the Kickstart ROM at address 0x0 in place of
chip RAM is not implemented because the CPU reset has been configured
to jump into the Kickstart ROM address directly. Kickstart immediately
turns off the OVL bit in order to access chip RAM, and it would make
zero sense to re-enable that bit and lose access to chip RAM.

The copper / blitter DMA interaction bug hasn't been implemented,
although if it would apply, a DPRINTF() warning is printed, in order
to see if it would make sense to add an option for bug-compatibility.

The last "feature" which was intentionally omitted is the A4000-only
chip register shadow in the 1MB region at 0x00c00000, where 24-bit
addressing Amigas sometimes map fast or pseudo-fast RAM. The CBM
chip specification for Gary (4393) says this shadow mapping is for
compatibility, but it makes no sense to map chip registers where
some older program may be expecting to see RAM, if anything. So the
address space from 0xc00000 to 0xcfffff is left unmapped instead.
  • Loading branch information
jhamby committed Nov 11, 2021
1 parent 0a70bcf commit f442b8a
Show file tree
Hide file tree
Showing 16 changed files with 3,119 additions and 0 deletions.
67 changes: 67 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
=============================
QEMU Amiga/m68k Release Notes
=============================

This GitHub repo contains Jake Hamby's implementation of a Commodore
Amiga 4000/040, including the AGA chipset. My intention is to
contribute this code to the official QEMU repo as soon as it's
sufficiently reliable and fast.

The code doesn't work yet but it should at least compile.
I hope to complete the project over the next several weeks.
The following are the release notes for the planed 1.0 release.

Amiga 4000 IDE support is implemented, but no floppy emulation (yet).
The default system type is PAL, with an "ntsc" machine option boolean.
It has 2 MiB chip RAM, keyboard, mouse on port 1, and no joystick.
The default, and maximum autoconfigurable, fast RAM size is 112 MiB.

The chipset emulation is incomplete and it doesn't run yet.

The left-Amiga key is mapped to left-Meta (aka left-Windows key).
The right-Amiga key is mapped to right-Ctrl, right-Meta, and Menu,
to accommodate keyboards which may only have one of those keys.
The End key (and Help, if present) are mapped to Help, and the
Home and PgUp keys map to numeric keypad left and right parens.
PgDn is mapped to the international key left of Return, and both
Insert and the angle brackets key, if present, are mapped to the
angle brackets key to the right of left Shift. The optional A3000
10-second warm reset warning for Ctrl-Amiga-Amiga is implemented.
Mouse wheel events are sent through keyboard scancodes as well.

Planned features:

* floppy disk images, including .adf and MS-DOS 720K/1.44M formats
* optimized screen refresh mode for low-bandwidth remote connections
* SCSI support (emulating Amiga 4000T built-in controller)
* RS-232 serial (Paula) and parallel printer (CIAs) ports
* Zorro II/III bus support (including INT2 and INT6 GPIO lines)
* A2065 Ethernet support (use existing QEMU Lance Ethernet)
* Zorro expansion RAM (up to 2 GB, vs. 112 MB motherboard RAM)
* Picasso II/IV or another suitable RTG-compatible graphics card
* USB gamepad (and second mouse support if possible)
* Configurable stereo separation and Amiga low-pass audio filter
* interface to real Amiga devices via Raspberry Pi GPIO lines
* PCI bus interface and virtio devices (with AmigaOS support)

Three aspects of the A4000 have been intentionally left unimplemented.
The power-on overlay of the Kickstart ROM at address 0x0 in place of
chip RAM is not implemented because the CPU reset has been configured
to jump into the Kickstart ROM address directly. Kickstart immediately
turns off the OVL bit in order to access chip RAM, and it would make
no sense to re-enable that bit and lose access to chip RAM.

The copper / blitter DMA interaction bug hasn't been implemented,
although if it would apply, a DPRINTF() warning is printed, in order
to see if it would make sense to add an option for bug-compatibility.

The last "feature" which was intentionally omitted is the A4000-only
chip register shadow in the 1MB region at 0x00c00000, where 24-bit
addressing Amigas sometimes map fast or pseudo-fast RAM. The CBM
chip specification for Gary (4393) says this shadow mapping is for
compatibility, but it makes no sense to map chip registers where
some older program may be expecting to see RAM, if anything. So the
address space from 0xc00000 to 0xcfffff is left unmapped instead.

Original README below.

===========
QEMU README
===========
Expand Down
1 change: 1 addition & 0 deletions configs/devices/m68k-softmmu/default.mak
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ CONFIG_MCF5208=y
CONFIG_NEXTCUBE=y
CONFIG_Q800=y
CONFIG_M68K_VIRT=y
CONFIG_AMIGA=y
4 changes: 4 additions & 0 deletions hw/ide/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ config IDE_SII3112
bool
select IDE_PCI
select IDE_QDEV

config AMIGA_IDE
bool
select IDE_QDEV
248 changes: 248 additions & 0 deletions hw/ide/amiga-ide.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
/*
* QEMU IDE Emulation: Amiga 4000/4000T 16-bit IDE interface
*
* Copyright (c) 2003 Fabrice Bellard
* Copyright (c) 2006 Openedhand Ltd.
* Copyright (c) 2021 Jake Hamby
*
* 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 "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "sysemu/blockdev.h"
#include "sysemu/dma.h"

#include "hw/ide/internal.h"
#include "hw/misc/amiga.h"
#include "hw/qdev-properties.h"
#include "qom/object.h"

OBJECT_DECLARE_SIMPLE_TYPE(AmigaIDEState, AMIGA_IDE)

struct AmigaIDEState {
SysBusDevice parent_obj;

IDEBus bus;

bool saved_irq;
MemoryRegion iomem;
};

static uint64_t amiga_ide_read(void *opaque, hwaddr addr,
unsigned size)
{
AmigaIDEState *s = AMIGA_IDE(opaque);

uint32_t port_addr = (addr >> 2) & 0x07;
uint32_t byte_shift = (size == 2) ? 8 : 0;

switch (addr & 0x1002) {
case 0x0000:
/* 16-bit data read (0x1f0) */
if (unlikely(port_addr != 0)) {
/* return the 8-bit status shifted to big-endian word. */
DPRINTF("Error: 16-bit IDE control register read.\n");
return ide_ioport_read(&s->bus, port_addr) << byte_shift;
} else {
#ifdef DEBUG_AMIGA
if (unlikely(size == 1)) {
DPRINTF("Error: 8-bit IDE data read at 16-bit address!\n");
}
#endif
return ide_data_readw(&s->bus, port_addr);
}

case 0x0002:
/* 8-bit port read (0x1f1 - 1x1f7) */
#ifdef DEBUG_AMIGA
if (unlikely(port_addr == 0)) {
DPRINTF("Warning: 8-bit IDE data read may not work!\n");
}
#endif
return ide_ioport_read(&s->bus, port_addr) << byte_shift;

case 0x1000:
/* highest bit of 8/16-bit IDE interrupt register */
return s->saved_irq ? (0x80 << byte_shift) : 0;

case 0x1002:
/* 8-bit IDE status register (0x3f6 - 0x3f7) */
return ide_status_read(&s->bus, port_addr) << byte_shift;

default:
g_assert_not_reached();
return 0;
}
}

static void amiga_ide_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
AmigaIDEState *s = AMIGA_IDE(opaque);

uint32_t port_addr = (addr >> 2) & 0x07;
uint32_t byte_shift = (size == 2) ? 8 : 0;

switch (addr & 0x1002) {
case 0x0000:
/* 16-bit data write (0x1f0) */
if (unlikely(port_addr != 0)) {
/* write the 8-bit status shifted from big-endian word. */
DPRINTF("Error: 16-bit IDE control register write.\n");
ide_ioport_write(&s->bus, port_addr, (val >> byte_shift));
break;
}
#ifdef DEBUG_AMIGA
if (unlikely(size == 1)) {
DPRINTF("Error: 8-bit IDE data write at 16-bit address!\n");
}
#endif
ide_data_writew(&s->bus, port_addr, val);
break;

case 0x0002:
/* 8-bit port write (0x1f1 - 1x1f7) */
#ifdef DEBUG_AMIGA
if (unlikely(size == 2)) {
DPRINTF("Error: 16-bit IDE port write at 8-bit address!\n");
}
#endif
ide_ioport_write(&s->bus, port_addr, (val >> byte_shift));
break;

default:
DPRINTF("Error: unhandled IDE write value 0x%"PRIx64" size %u to "
"addr 0x%"PRIx64"\n", val, size, addr);
}
}

/* Note: the 16-bit data accesses are big-endian (I hope). */
static const MemoryRegionOps amiga_ide_ops = {
.read = amiga_ide_read,
.write = amiga_ide_write,
.impl = {
.min_access_size = 1,
.max_access_size = 2,
},
.endianness = DEVICE_BIG_ENDIAN, /* FIX THIS if incorrect */
};

static const VMStateDescription vmstate_amiga_ide = {
.name = TYPE_AMIGA_IDE,
.version_id = 0,
.minimum_version_id = 0,
.fields = (VMStateField[]) {
VMSTATE_IDE_BUS(bus, AmigaIDEState),
VMSTATE_IDE_DRIVES(bus.ifs, AmigaIDEState),
VMSTATE_BOOL(saved_irq, AmigaIDEState),
VMSTATE_END_OF_LIST()
}
};

static void amiga_ide_set_irq(void *opaque, int irq, int level)
{
AmigaIDEState *s = AMIGA_IDE(opaque);
s->saved_irq = level;
}

static void amiga_ide_realizefn(DeviceState *dev, Error **errp)
{
SysBusDevice *d = SYS_BUS_DEVICE(dev);
AmigaIDEState *s = AMIGA_IDE(dev);

/* handle the interrupt ourselves */
ide_init2(&s->bus, qdev_get_gpio_in(DEVICE(s), 0));

memory_region_init_io(&s->iomem, OBJECT(s), &amiga_ide_ops, s,
TYPE_AMIGA_IDE, AMIGA_4000_IDE_SIZE);
sysbus_init_mmio(d, &s->iomem);
}

/* Initialize the IDE bus and make a GPIO in for its interrupts. */
static void amiga_ide_initfn(Object *obj)
{
AmigaIDEState *s = AMIGA_IDE(obj);

ide_bus_init(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2);

qdev_init_gpio_in(DEVICE(s), amiga_ide_set_irq, 1);
}

/* Reset our local state during enter phase. */
static void amiga_ide_reset_enter(Object *obj, ResetType type)
{
AmigaIDEState *s = AMIGA_IDE(obj);

DPRINTF("IDE entering reset phase.\n");
s->saved_irq = false;
}

/* Call the IDE reset function during hold phase. */
static void amiga_ide_reset_hold(Object *obj)
{
AmigaIDEState *s = AMIGA_IDE(obj);

DPRINTF("IDE resetting bus.\n");
ide_bus_reset(&s->bus);
}

static void amiga_ide_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
ResettableClass *rc = RESETTABLE_CLASS(oc);

dc->realize = amiga_ide_realizefn;
dc->vmsd = &vmstate_amiga_ide;
rc->phases.enter = amiga_ide_reset_enter;
rc->phases.hold = amiga_ide_reset_hold;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}

static const TypeInfo amiga_ide_type_info = {
.name = TYPE_AMIGA_IDE,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(AmigaIDEState),
.instance_init = amiga_ide_initfn,
.class_init = amiga_ide_class_init,
};

static void amiga_ide_register_types(void)
{
type_register_static(&amiga_ide_type_info);
}

/* Called by Amiga machine init function to attach up to two drives. */
void amiga_ide_init_drives(DeviceState *dev, DriveInfo **hd)
{
AmigaIDEState *s = AMIGA_IDE(dev);

for (int i = 0; i < 2; ++i) {
if (hd[i] != NULL) {
DPRINTF("Attaching IDE %s drive as unit %d",
(hd[i]->media_cd ? "CD-ROM" : "hard"), i);

ide_create_drive(&s->bus, i, hd[i]);
}
}
}

type_init(amiga_ide_register_types)
1 change: 1 addition & 0 deletions hw/ide/meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
softmmu_ss.add(when: 'CONFIG_AHCI', if_true: files('ahci.c'))
softmmu_ss.add(when: 'CONFIG_AHCI_ICH9', if_true: files('ich.c'))
softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('ahci-allwinner.c'))
softmmu_ss.add(when: 'CONFIG_AMIGA_IDE', if_true: files('amiga-ide.c'))
softmmu_ss.add(when: 'CONFIG_IDE_CMD646', if_true: files('cmd646.c'))
softmmu_ss.add(when: 'CONFIG_IDE_CORE', if_true: files('core.c', 'atapi.c'))
softmmu_ss.add(when: 'CONFIG_IDE_ISA', if_true: files('isa.c', 'ioport.c'))
Expand Down
5 changes: 5 additions & 0 deletions hw/m68k/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ config M68K_VIRT
select GOLDFISH_TTY
select GOLDFISH_RTC
select VIRTIO_MMIO

config AMIGA
bool
select AMIGA_IDE
select AMIGA_RTC
Loading

1 comment on commit f442b8a

@barracuda156
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jhamby Current qemu is broken for ppc32 host: macports/macports-ports#14807
I made a quick patch, but apparently it is not enough. If you are interested, please take a look. Maybe you can help us to fix it.

Please sign in to comment.