Merge remote-tracking branch 'upstream/master'

# Conflicts: # src/mame/altos/altos5.cpp # src/mame/ausnz/aussiebyte.cpp # src/mame/kaypro/kaypro_m.cpp # src/mame/ncr/dmv.cpp # src/mame/sony/smc777.cpp # src/mame/xerox/xerox820.cpp
Robbbert · Sep 19, 2024 · 3f8dc09 · 3f8dc09
2 parents 3d4f5cb + 844b076
commit 3f8dc09
Show file tree

Hide file tree

Showing 214 changed files with 952 additions and 687 deletions.
diff --git a/hash/bmjr_cass.xml b/hash/bmjr_cass.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0-1.0
+-->
+<softwarelist name="bmjr_cass" description="Hitachi Basic Master Jr. cassettes">
+
+	<!-- TODO: compatible with Basic Master LV2 too -->
+	<software name="wilwesp" supported="yes">
+		<!-- Capitalized as WILWESP on Micom Basic printout, wILwESP in-game -->
+		<description>Wilwesp</description>
+		<year>1984</year>
+		<publisher>Micom BASIC</publisher>
+		<info name="usage" value="LOAD WILWSP then RUN" />
+		<info name="author" value="Orange Juice"/>
+		<part name="cass" interface="bmjr_cass">
+			<dataarea name="cass" size="23584812">
+				<rom name="wilwesp.wav" size="23584812" crc="d46d46e6" sha1="32494926110bdb015e85d18dff2ea7b2f6d58580"/>
+			</dataarea>
+		</part>
+	</software>
+</softwarelist>
diff --git a/scripts/minimaws/lib/auxverbs.py b/scripts/minimaws/lib/auxverbs.py
@@ -17,7 +17,7 @@
 
 class _Identifier(object):
     def __init__(self, dbcurs, **kwargs):
-        super(_Identifier, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbcurs = dbcurs
         self.shortnamewidth = 0
         self.pathwidth = 0

diff --git a/scripts/minimaws/lib/dbaccess.py b/scripts/minimaws/lib/dbaccess.py
@@ -571,7 +571,7 @@ class UpdateQueries(object):
 
 class QueryCursor(object):
     def __init__(self, dbconn, **kwargs):
-        super(QueryCursor, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbcurs = dbconn.cursor()
 
     def close(self):
@@ -913,7 +913,7 @@ def get_software_disk_dumps(self, sha1):
 
 class UpdateCursor(object):
     def __init__(self, dbconn, **kwargs):
-        super(UpdateCursor, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbcurs = dbconn.cursor()
 
     def close(self):
@@ -1063,7 +1063,7 @@ def add_softwarediskdump(self, part, name, sha1, bad):
 
 class QueryConnection(object):
     def __init__(self, database, **kwargs):
-        super(QueryConnection, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbconn = sqlite3.connect('file:' + urllib.request.pathname2url(database) + '?mode=ro', uri=True, check_same_thread=False)
         self.dbconn.row_factory = sqlite3.Row
         self.dbconn.execute('PRAGMA foreign_keys = ON')
@@ -1077,7 +1077,7 @@ def cursor(self):
 
 class UpdateConnection(object):
     def __init__(self, database, **kwargs):
-        super(UpdateConnection, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbconn = sqlite3.connect(database)
         self.dbconn.execute('PRAGMA page_size = 4096')
         self.dbconn.execute('PRAGMA foreign_keys = ON')

diff --git a/scripts/minimaws/lib/lxparse.py b/scripts/minimaws/lib/lxparse.py
@@ -14,7 +14,7 @@
 
 class ElementHandlerBase(object):
     def __init__(self, parent, **kwargs):
-        super(ElementHandlerBase, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbconn = parent.dbconn if parent is not None else None
         self.locator = parent.locator if parent is not None else None
         self.depth = 0
@@ -105,7 +105,7 @@ class ElementHandler(ElementHandlerBase):
 
 class TextAccumulator(ElementHandler):
     def __init__(self, parent, **kwargs):
-        super(TextAccumulator, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.text = ''
 
     def mainCharacters(self, content):
@@ -114,7 +114,7 @@ def mainCharacters(self, content):
 
 class DipSwitchHandler(ElementHandler):
     def __init__(self, parent, **kwargs):
-        super(DipSwitchHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.machine = parent.id
 
@@ -138,7 +138,7 @@ def startChildElement(self, name, attrs):
 
 class SlotHandler(ElementHandler):
     def __init__(self, parent, **kwargs):
-        super(SlotHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.machine = parent.id
 
@@ -155,7 +155,7 @@ def startChildElement(self, name, attrs):
 
 class RamOptionHandler(TextAccumulator):
     def __init__(self, parent, **kwargs):
-        super(RamOptionHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.machine = parent.id
 
@@ -181,7 +181,7 @@ class MachineHandler(ElementHandler):
             'ramoption':        RamOptionHandler }
 
     def __init__(self, parent, **kwargs):
-        super(MachineHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = self.dbconn.cursor()
 
     def startMainElement(self, name, attrs):
@@ -248,7 +248,7 @@ def endChildHandler(self, name, handler):
 
 class ListXmlHandler(ElementHandler):
     def __init__(self, dbconn, **kwargs):
-        super(ListXmlHandler, self).__init__(parent=None, **kwargs)
+        super().__init__(parent=None, **kwargs)
         self.dbconn = dbconn
 
     def startDocument(self):
@@ -290,7 +290,7 @@ def processingInstruction(self, target, data):
 
 class DataAreaHandler(ElementHandler):
     def __init__(self, parent, **kwargs):
-        super(DataAreaHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.part = parent.id
 
@@ -309,7 +309,7 @@ def startChildElement(self, name, attrs):
 
 class DiskAreaHandler(ElementHandler):
     def __init__(self, parent, **kwargs):
-        super(DiskAreaHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.part = parent.id
 
@@ -330,7 +330,7 @@ class SoftwarePartHandler(ElementHandler):
             'diskarea':         DiskAreaHandler }
 
     def __init__(self, parent, **kwargs):
-        super(SoftwarePartHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = parent.dbcurs
         self.software = parent.id
 
@@ -356,7 +356,7 @@ class SoftwareHandler(ElementHandler):
             'part':             SoftwarePartHandler }
 
     def __init__(self, parent, **kwargs):
-        super(SoftwareHandler, self).__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, **kwargs)
         self.dbcurs = self.dbconn.cursor()
         self.softwarelist = parent.id
 
@@ -400,7 +400,7 @@ class SoftwareListHandler(ElementHandler):
             'software':         SoftwareHandler }
 
     def __init__(self, dbconn, **kwargs):
-        super(SoftwareListHandler, self).__init__(parent=None, **kwargs)
+        super().__init__(parent=None, **kwargs)
         self.dbconn = dbconn
 
     def startDocument(self):

diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py
@@ -39,7 +39,7 @@ class HandlerBase(object):
             505: 'HTTP Version Not Supported' }
 
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(HandlerBase, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.app = app
         self.js_escape = app.js_escape
         self.application_uri = application_uri
@@ -52,7 +52,7 @@ def error_page(self, code):
 
 class ErrorPageHandler(HandlerBase):
     def __init__(self, code, app, application_uri, environ, start_response, **kwargs):
-        super(ErrorPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.code = code
         self.start_response('%d %s' % (self.code, self.STATUS_MESSAGE[code]), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')])
 
@@ -64,7 +64,7 @@ class AssetHandler(HandlerBase):
     EXTENSIONMAP = { '.js': 'application/javascript', '.svg': 'image/svg+xml' }
 
     def __init__(self, directory, app, application_uri, environ, start_response, **kwargs):
-        super(AssetHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.directory = directory
         self.asset = shiftpath(environ)
 
@@ -99,7 +99,7 @@ def __iter__(self):
 
 class QueryPageHandler(HandlerBase):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.dbcurs = app.dbconn.cursor()
 
     def machine_href(self, shortname):
@@ -191,7 +191,7 @@ def softwarelist_data(self, machine):
 
 class MachineRpcHandlerBase(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(MachineRpcHandlerBase, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.shortname = shiftpath(environ)
 
     def __iter__(self):
@@ -216,7 +216,7 @@ def __iter__(self):
 
 class MachineHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(MachineHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.shortname = shiftpath(environ)
 
     def __iter__(self):
@@ -464,7 +464,7 @@ def sanitised_json(data):
 
 class SourceFileHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(SourceFileHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
 
     def __iter__(self):
         self.filename = self.environ['PATH_INFO']
@@ -577,7 +577,7 @@ def machine_row(self, machine_info):
 
 class SoftwareListHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(SoftwareListHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.shortname = shiftpath(environ)
         self.software = shiftpath(environ)
 
@@ -788,7 +788,7 @@ def format_supported(supported):
 
 class RomIdentHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
         self.dbcurs = app.dbconn.cursor()
 
     def __iter__(self):
@@ -833,7 +833,7 @@ def data_page(self, machine):
 
 class RomDumpsRpcHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(RomDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
 
     def __iter__(self):
         if self.environ['PATH_INFO']:
@@ -890,7 +890,7 @@ def data_page(self, crc, sha1):
 
 class DiskDumpsRpcHandler(QueryPageHandler):
     def __init__(self, app, application_uri, environ, start_response, **kwargs):
-        super(DiskDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+        super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
 
     def __iter__(self):
         if self.environ['PATH_INFO']:
@@ -954,7 +954,7 @@ class MiniMawsApp(object):
             'diskdumps':        DiskDumpsRpcHandler }
 
     def __init__(self, dbfile, **kwargs):
-        super(MiniMawsApp, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dbconn = dbaccess.QueryConnection(dbfile)
         self.assetsdir = os.path.join(os.path.dirname(inspect.getfile(self.__class__)), 'assets')
         if not mimetypes.inited:

diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
@@ -5643,6 +5643,8 @@ if (BUSES["PCI"]~=null) then
 		MAME_DIR .. "src/devices/bus/pci/mga2064w.h",
 		MAME_DIR .. "src/devices/bus/pci/ncr53c825.cpp",
 		MAME_DIR .. "src/devices/bus/pci/ncr53c825.h",
+		MAME_DIR .. "src/devices/bus/pci/neon250.cpp",
+		MAME_DIR .. "src/devices/bus/pci/neon250.h",
 		MAME_DIR .. "src/devices/bus/pci/oti_spitfire.cpp",
 		MAME_DIR .. "src/devices/bus/pci/oti_spitfire.h",
 		MAME_DIR .. "src/devices/bus/pci/opti82c861.cpp",