SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Rework "next-cube" to bring it up-to-date with current coding standards/APIs

Browse Source 
* Remove overlapping memory regions of the "next-cube" machine
 * Encapsulate the next-cube SCSI related code into a separate device
 * QOM-ify the next-rtc device
 * Declare m68k devices as big endian instead of native endian
 * Disable the CD-ROM drive for the next-cube machine
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmdw93wTHGh1dGhAdHV4
 ZmFtaWx5Lm9yZwAKCRAu2dd0/nAttdVOEACEqPMTb5cea/fsI6x29dxx0btnNZaB
 MhN72qmmGS1GMr03u6hGMrIPgkFa/HQL86SAUxWDt4qg3XJKpJ8p9KLqFm393Dgi
 UEZnvzhX2NP23Cf4M0EaHSAeQOfaYdsgOzivo+7fQUIkpXaRpmu+3VIjvhUESSOb
 37p1kqdjXf73t7aUMBXA2hCZctm+vOOKdJd25MfrhZp6Yvxly90P2QW+lKzFBUIp
 d2uyZ/FaBXKiGWHMTmpbloIvL6sP8ag/e+deRfKQlBlC3lVpTyREvAKoNret5Rgt
 uYQ1Erbo7Bz8BKrwFrlObbGxn1WoaoCmiPJGzPtn8mfQ33QwS8B3+Np5OfgvinAR
 B6YBXNBIenjUFgJKY9jSXy4IlzfFc4mMKn6kgTv+y9srf9Np1EgmkYuOXxxytPzP
 fE+blTWXgj6EvhUYNtqDgaN0NdW+4YSbr2Lzy/ZNGX7eLJ5S9PZdSU7gb2T+2y2N
 sdAkPiXP1lmTzPkG9gzQ0EljO36gOgSpKWjxf72NvluVGoTBLtKqB8NmVO1YnyVC
 0/QA/SxZGjsT8MMlhjheWg+lCKRjzTpjfw4C8CvukSsiOHX4pnX9yRreJ2s7z6W3
 26SxK1nIvn3VODXhXAgB23zHZlgk/lWSJXUuBOsnAk5YMgy7KyDn6r92FNBhj+e2
 3O0SEi9HC/wUKw==
 =js2G
 -----END PGP SIGNATURE-----

Merge tag 'pull-request-2024-12-29' of https://gitlab.com/huth/qemu into staging

* Rework "next-cube" to bring it up-to-date with current coding standards/APIs
* Remove overlapping memory regions of the "next-cube" machine
* Encapsulate the next-cube SCSI related code into a separate device
* QOM-ify the next-rtc device
* Declare m68k devices as big endian instead of native endian
* Disable the CD-ROM drive for the next-cube machine

# -----BEGIN PGP SIGNATURE-----
#
# iQJHBAABCAAxFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmdw93wTHGh1dGhAdHV4
# ZmFtaWx5Lm9yZwAKCRAu2dd0/nAttdVOEACEqPMTb5cea/fsI6x29dxx0btnNZaB
# MhN72qmmGS1GMr03u6hGMrIPgkFa/HQL86SAUxWDt4qg3XJKpJ8p9KLqFm393Dgi
# UEZnvzhX2NP23Cf4M0EaHSAeQOfaYdsgOzivo+7fQUIkpXaRpmu+3VIjvhUESSOb
# 37p1kqdjXf73t7aUMBXA2hCZctm+vOOKdJd25MfrhZp6Yvxly90P2QW+lKzFBUIp
# d2uyZ/FaBXKiGWHMTmpbloIvL6sP8ag/e+deRfKQlBlC3lVpTyREvAKoNret5Rgt
# uYQ1Erbo7Bz8BKrwFrlObbGxn1WoaoCmiPJGzPtn8mfQ33QwS8B3+Np5OfgvinAR
# B6YBXNBIenjUFgJKY9jSXy4IlzfFc4mMKn6kgTv+y9srf9Np1EgmkYuOXxxytPzP
# fE+blTWXgj6EvhUYNtqDgaN0NdW+4YSbr2Lzy/ZNGX7eLJ5S9PZdSU7gb2T+2y2N
# sdAkPiXP1lmTzPkG9gzQ0EljO36gOgSpKWjxf72NvluVGoTBLtKqB8NmVO1YnyVC
# 0/QA/SxZGjsT8MMlhjheWg+lCKRjzTpjfw4C8CvukSsiOHX4pnX9yRreJ2s7z6W3
# 26SxK1nIvn3VODXhXAgB23zHZlgk/lWSJXUuBOsnAk5YMgy7KyDn6r92FNBhj+e2
# 3O0SEi9HC/wUKw==
# =js2G
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 29 Dec 2024 02:17:16 EST
# 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

* tag 'pull-request-2024-12-29' of https://gitlab.com/huth/qemu: (35 commits)
  next-cube: add my copyright to the top of the file
  next-cube: rename old_scr2 and scr2_2 in next_scr2_rtc_update()
  next-cube: move next_rtc_cmd_is_write() and next_rtc_data_in_irq() functions
  next-cube: add rtc-power-out named gpio to trigger the NEXT_PWR_I interrupt
  next-cube: add rtc-cmd-reset named gpio to reset the rtc state machine
  next-cube: use named gpio output for next-rtc data
  next-cube: move rtc-data-in gpio from next-pc to next-rtc device
  next-cube: move reset of next-rtc fields from next-pc to next-rtc
  next-cube: QOMify NeXTRTC
  next-cube: don't use rtc phase value of -1
  next-cube: use named gpio to read RTC data bit in scr2
  next-cube: use named gpio to set RTC data bit in scr2
  next-cube: always use retval to return rtc read values
  next-cube: separate rtc read and write shift logic
  next-cube: use qemu_irq to drive int_status in next_scr2_rtc_update()
  next-cube: rename typedef struct NextRtc to NeXTRTC
  next-cube: convert next-pc device to use Resettable interface
  next-cube: rearrange NeXTState declarations to improve readability
  next-cube: remove unused next.scr memory region
  next-cube: add empty slots for unknown accesses to next.scr memory region
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2024-12-29 03:25:40 -05:00
commit 7c89e226f8
6 changed files with 675 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/m68k/Kconfig
View File

@ -18,6 +18,7 @@ config NEXTCUBE
depends on M68K depends on M68K
select FRAMEBUFFER select FRAMEBUFFER
select ESCC select ESCC
select EMPTY_SLOT
config Q800 config Q800
bool bool

2
hw/m68k/mcf5206.c
View File

@ -582,7 +582,7 @@ static const MemoryRegionOps m5206_mbar_ops = {
.write = m5206_mbar_writefn, .write = m5206_mbar_writefn,
.valid.min_access_size = 1, .valid.min_access_size = 1,
.valid.max_access_size = 4, .valid.max_access_size = 4,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void mcf5206_mbar_realize(DeviceState *dev, Error **errp) static void mcf5206_mbar_realize(DeviceState *dev, Error **errp)

6
hw/m68k/mcf5208.c
View File

@ -155,7 +155,7 @@ static uint64_t m5208_timer_read(void *opaque, hwaddr addr,
static const MemoryRegionOps m5208_timer_ops = { static const MemoryRegionOps m5208_timer_ops = {
.read = m5208_timer_read, .read = m5208_timer_read,
.write = m5208_timer_write, .write = m5208_timer_write,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static uint64_t m5208_sys_read(void *opaque, hwaddr addr, static uint64_t m5208_sys_read(void *opaque, hwaddr addr,
@ -192,7 +192,7 @@ static void m5208_sys_write(void *opaque, hwaddr addr,
static const MemoryRegionOps m5208_sys_ops = { static const MemoryRegionOps m5208_sys_ops = {
.read = m5208_sys_read, .read = m5208_sys_read,
.write = m5208_sys_write, .write = m5208_sys_write,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static uint64_t m5208_rcm_read(void *opaque, hwaddr addr, static uint64_t m5208_rcm_read(void *opaque, hwaddr addr,
@ -224,7 +224,7 @@ static void m5208_rcm_write(void *opaque, hwaddr addr,
static const MemoryRegionOps m5208_rcm_ops = { static const MemoryRegionOps m5208_rcm_ops = {
.read = m5208_rcm_read, .read = m5208_rcm_read,
.write = m5208_rcm_write, .write = m5208_rcm_write,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic, static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic,

2
hw/m68k/mcf_intc.c
View File

@ -166,7 +166,7 @@ static void mcf_intc_reset(DeviceState *dev)
static const MemoryRegionOps mcf_intc_ops = { static const MemoryRegionOps mcf_intc_ops = {
.read = mcf_intc_read, .read = mcf_intc_read,
.write = mcf_intc_write, .write = mcf_intc_write,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void mcf_intc_instance_init(Object *obj) static void mcf_intc_instance_init(Object *obj)

1042
hw/m68k/next-cube.c
View File

File diff suppressed because it is too large Load Diff

2
hw/m68k/next-kbd.c
View File

@ -162,7 +162,7 @@ static const MemoryRegionOps kbd_ops = {
.write = kbd_writefn, .write = kbd_writefn,
.valid.min_access_size = 1, .valid.min_access_size = 1,
.valid.max_access_size = 4, .valid.max_access_size = 4,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static const int qcode_to_nextkbd_keycode[] = { static const int qcode_to_nextkbd_keycode[] = {