Merge branch 'mamedev:master' into 140426

Author: mamehaze

docs/source/initialsetup/compilingmame.rst

@@ -111,23 +111,6 @@ These instructions assume you have some familiarity with MSYS2 and the
 * Install packages necessary to build MAME.  At the very least, you’ll need
   ``bash``, ``git`` and ``make``.
 * For debugging you may want to install ``gdb``.
-* To build the HTML user/developer documentation, you’ll need
-  ``mingw-w64-clang-x86_64-librsvg``, ``mingw-w64-clang-x86_64-python-sphinx``,
-  ``mingw-w64-clang-x86_64-python-sphinx_rtd_theme`` and
-  ``mingw-w64-clang-x86_64-python-sphinxcontrib-svg2pdfconverter`` for a CLANG64
-  environment (or alternatively ``mingw-w64-clang-aarch64-librsvg``,
-  ``mingw-w64-clang-aarch64-python-sphinx``,
-  ``mingw-w64-clang-aarch64-python-sphinx_rtd_theme`` and
-  ``mingw-w64-clang-aarch64-python-sphinxcontrib-svg2pdfconverter`` a CLANGARM64
-  environment).
-* To build the PDF documentation, you’ll additionally need
-  ``mingw-w64-ucrt-x86_64-texlive-latex-extra`` and
-  ``mingw-w64-ucrt-x86_64-texlive-fonts-recommended`` for a UCRT64 environment,
-  or ``mingw-w64-clang-x86_64-texlive-latex-extra`` and
-  ``mingw-w64-clang-x86_64-texlive-fonts-recommended`` for a CLANG64
-  environment.  You must build the PDF documentation using the UCRT64 or CLANG64
-  environment as the TeX Live tools currently do not work with the CLANGARM64
-  environment.
 * To generate API documentation from source, you’ll need ``doxygen``.
 * If you plan to rebuild bgfx shaders and you want to rebuild the GLSL parser,
   you’ll need ``bison``.
@@ -148,6 +131,13 @@ building for.
 * To build against the portable SDL interfaces, you’ll need
   ``mingw-w64-ucrt-x86_64-SDL2`` and ``mingw-w64-ucrt-x86_64-SDL2_ttf``.
 * To build the Qt debugger, you’ll need ``mingw-w64-ucrt-x86_64-qt6-base``.
+* To build the HTML user/developer documentation, you’ll need
+  ``mingw-w64-ucrt-x86_64-librsvg``, ``mingw-w64-ucrt-x86_64-python-sphinx``,
+  ``mingw-w64-ucrt-x86_64-python-sphinx_rtd_theme`` and
+  ``mingw-w64-ucrt-x86_64-python-sphinxcontrib-svg2pdfconverter``.
+* To build the PDF documentation, you’ll additionally need
+  ``mingw-w64-ucrt-x86_64-texlive-latex-extra`` and
+  ``mingw-w64-ucrt-x86_64-texlive-fonts-recommended``.
 * Open the **ucrt64.exe** helper from the **msys64** installation folder or the
   **MSYS2 UCRT64** shortcut from the start menu to start a Bash shell configured
   with the correct paths and environment variables.
@@ -163,6 +153,13 @@ building for.
 * To build against the portable SDL interfaces, you’ll need
   ``mingw-w64-clang-x86_64-SDL2`` and ``mingw-w64-clang-x86_64-SDL2_ttf``.
 * To build the Qt debugger, you’ll need ``mingw-w64-clang-x86_64-qt6-base``.
+* To build the HTML user/developer documentation, you’ll need
+  ``mingw-w64-clang-x86_64-librsvg``, ``mingw-w64-clang-x86_64-python-sphinx``,
+  ``mingw-w64-clang-x86_64-python-sphinx_rtd_theme`` and
+  ``mingw-w64-clang-x86_64-python-sphinxcontrib-svg2pdfconverter``.
+* To build the PDF documentation, you’ll additionally need
+  ``mingw-w64-clang-x86_64-texlive-latex-extra`` and
+  ``mingw-w64-clang-x86_64-texlive-fonts-recommended``.
 * Open the **clang64.exe** helper from the **msys64** installation folder or use
   the **MSYS2 CLANG64** shortcut to start a Bash shell configured with the
   correct paths and environment variables.
@@ -178,6 +175,15 @@ building for.
 * To build against the portable SDL interfaces, you’ll need
   ``mingw-w64-clang-aarch64-SDL2`` and ``mingw-w64-clang-aarch64-SDL2_ttf``.
 * To build the Qt debugger, you’ll need ``mingw-w64-clang-aarch64-qt6-base``.
+* To build the HTML user/developer documentation, you’ll need
+  ``mingw-w64-clangarm64-x86_64-librsvg``,
+  ``mingw-w64-clangarm64-x86_64-python-sphinx``,
+  ``mingw-w64-clangarm64-x86_64-python-sphinx_rtd_theme`` and
+  ``mingw-w64-clangarm64-x86_64-python-sphinxcontrib-svg2pdfconverter``.
+* It is not currently possible to build the PDF documentation using the
+  CLANGARM64 environment as the TeX Live tools do not work.  You may be able
+  to use the UCRT64 or CLANG64 environment to build the PDF documentation on a
+  64-bit ARM system.
 * Open the **clangarm64.exe** helper from the **msys64** installation folder or
   use the **MSYS2 CLANGARM64** shortcut to start a Bash shell configured with
   the correct paths and environment variables.
@@ -457,7 +463,7 @@ can install these packages with
     pacman -S mingw-w64-x86_64-librsvg mingw-w64-x86_64-python-sphinx mingw-w64-x86_64-python-sphinxcontrib-svg2pdfconverter
 
 If you intend to make a PDF via LaTeX, you’ll need to install a LaTeX
-distribution such as TeX Live:
+distribution such as TeX Live:
 
 .. code-block:: bash
 
@@ -483,7 +489,7 @@ On Debian, you’ll need to install the **librsvg2-bin** package:
     sudo apt-get install librsvg2-bin
 
 If you intend to make a PDF via LaTeX, you’ll need to install a LaTeX
-distribution such as TeX Live:
+distribution such as TeX Live:
 
 .. code-block:: bash
 

src/devices/bus/cbmiec/c1526.cpp

@@ -24,7 +24,7 @@
 //**************************************************************************
 
 DEFINE_DEVICE_TYPE(C1526, c1526_device, "c1526", "Commodore 1526/MPS-802 Dot Matrix Printer")
-DEFINE_DEVICE_TYPE(C4023, c4023_device, "c4023", "Commodore 4023 Printer")
+DEFINE_DEVICE_TYPE(GPIB_C4023, c4023_device, "c4023", "Commodore 4023 Printer")
 
 
 //-------------------------------------------------
@@ -173,7 +173,7 @@ c1526_device::c1526_device(const machine_config &mconfig, const char *tag, devic
 //-------------------------------------------------
 
 c4023_device::c4023_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	c1526_device_base(mconfig, C4023, tag, owner, clock),
+	c1526_device_base(mconfig, GPIB_C4023, tag, owner, clock),
 	device_ieee488_interface(mconfig, *this)
 {
 }

src/devices/bus/cbmiec/c1526.h

@@ -79,7 +79,7 @@ class c4023_device : public c1526_device_base, public device_ieee488_interface
 
 // device type definition
 DECLARE_DEVICE_TYPE(C1526, c1526_device)
-DECLARE_DEVICE_TYPE(C4023, c4023_device)
+DECLARE_DEVICE_TYPE(GPIB_C4023, c4023_device)
 
 
 #endif // MAME_BUS_CBMIEC_C1526_H

src/devices/bus/ieee488/c2031.cpp

@@ -9,17 +9,22 @@
 #include "emu.h"
 #include "c2031.h"
 
+#include "cpu/m6502/m6502.h"
+#include "imagedev/floppy.h"
+#include "machine/64h156.h"
+#include "machine/6522via.h"
+
 #include "formats/d64_dsk.h"
 #include "formats/g64_dsk.h"
 
 
+namespace {
+
 //**************************************************************************
 //  MACROS / CONSTANTS
 //**************************************************************************
 
 #define M6502_TAG       "ucd5"
-#define M6522_0_TAG     "uab1"
-#define M6522_1_TAG     "ucd4"
 #define C64H156_TAG     "64h156"
 
 
@@ -32,10 +37,65 @@ enum
 
 
 //**************************************************************************
-//  DEVICE DEFINITIONS
+//  TYPE DEFINITIONS
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(C2031, c2031_device, "c2031", "Commodore 2031")
+// ======================> c2031_device
+
+class c2031_device :  public device_t,
+						public device_ieee488_interface
+{
+public:
+	// construction/destruction
+	c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device_t implementation
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual ioport_constructor device_input_ports() const override ATTR_COLD;
+
+	// device_ieee488_interface implementation
+	virtual void ieee488_atn(int state) override;
+	virtual void ieee488_ifc(int state) override;
+
+private:
+	inline int get_device_number();
+
+	void via0_irq_w(int state);
+	uint8_t via0_pa_r();
+	void via0_pa_w(uint8_t data);
+	uint8_t via0_pb_r();
+	void via0_pb_w(uint8_t data);
+	void via1_irq_w(int state);
+	uint8_t via1_pb_r();
+	void via1_pb_w(uint8_t data);
+	void byte_w(int state);
+
+	void c2031_mem(address_map &map) ATTR_COLD;
+
+	static void floppy_formats(format_registration &fr);
+
+	required_device<m6502_device> m_maincpu;
+	required_device<via6522_device> m_via0;
+	required_device<via6522_device> m_via1;
+	required_device<c64h156_device> m_ga;
+	required_device<floppy_image_device> m_floppy;
+	required_ioport m_address;
+	output_finder<2> m_leds;
+
+	// IEEE-488 bus
+	int m_nrfd_out;             // not ready for data
+	int m_ndac_out;             // not data accepted
+	int m_atna;                 // attention acknowledge
+	int m_ifc;
+
+	// interrupts
+	int m_via0_irq;             // VIA #0 interrupt request
+	int m_via1_irq;             // VIA #1 interrupt request
+};
 
 
 //-------------------------------------------------
@@ -66,8 +126,8 @@ const tiny_rom_entry *c2031_device::device_rom_region() const
 void c2031_device::c2031_mem(address_map &map)
 {
 	map(0x0000, 0x07ff).mirror(0x6000).ram();
-	map(0x1800, 0x180f).mirror(0x63f0).m(M6522_0_TAG, FUNC(via6522_device::map));
-	map(0x1c00, 0x1c0f).mirror(0x63f0).m(M6522_1_TAG, FUNC(via6522_device::map));
+	map(0x1800, 0x180f).mirror(0x63f0).m(m_via0, FUNC(via6522_device::map));
+	map(0x1c00, 0x1c0f).mirror(0x63f0).m(m_via1, FUNC(via6522_device::map));
 	map(0x8000, 0xbfff).mirror(0x4000).rom().region(M6502_TAG, 0);
 }
 
@@ -388,11 +448,11 @@ inline int c2031_device::get_device_number()
 //-------------------------------------------------
 
 c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, C2031, tag, owner, clock)
+	: device_t(mconfig, GPIB_C2031, tag, owner, clock)
 	, device_ieee488_interface(mconfig, *this)
 	, m_maincpu(*this, M6502_TAG)
-	, m_via0(*this, M6522_0_TAG)
-	, m_via1(*this, M6522_1_TAG)
+	, m_via0(*this, "uab1")
+	, m_via1(*this, "ucd4")
 	, m_ga(*this, C64H156_TAG)
 	, m_floppy(*this, C64H156_TAG":0:525ssqd")
 	, m_address(*this, "ADDRESS")
@@ -473,3 +533,12 @@ void c2031_device::ieee488_ifc(int state)
 
 	m_ifc = state;
 }
+
+} // anonymous namespace
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE_PRIVATE(GPIB_C2031, device_ieee488_interface, c2031_device, "c2031", "Commodore 2031 single disk drive")

src/devices/bus/ieee488/c2031.h

@@ -12,79 +12,10 @@
 #pragma once
 
 #include "ieee488.h"
-#include "cpu/m6502/m6502.h"
-#include "imagedev/floppy.h"
-#include "machine/64h156.h"
-#include "machine/6522via.h"
 
 
 
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// ======================> c2031_device
-
-class c2031_device :  public device_t,
-						public device_ieee488_interface
-{
-public:
-	// construction/destruction
-	c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	// device-level overrides
-	virtual void device_start() override ATTR_COLD;
-	virtual void device_reset() override ATTR_COLD;
-
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
-	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
-	virtual ioport_constructor device_input_ports() const override ATTR_COLD;
-
-	// device_ieee488_interface overrides
-	virtual void ieee488_atn(int state) override;
-	virtual void ieee488_ifc(int state) override;
-
-private:
-	inline int get_device_number();
-
-	void via0_irq_w(int state);
-	uint8_t via0_pa_r();
-	void via0_pa_w(uint8_t data);
-	uint8_t via0_pb_r();
-	void via0_pb_w(uint8_t data);
-	void via1_irq_w(int state);
-	uint8_t via1_pb_r();
-	void via1_pb_w(uint8_t data);
-	void byte_w(int state);
-
-	void c2031_mem(address_map &map) ATTR_COLD;
-
-	static void floppy_formats(format_registration &fr);
-
-	required_device<m6502_device> m_maincpu;
-	required_device<via6522_device> m_via0;
-	required_device<via6522_device> m_via1;
-	required_device<c64h156_device> m_ga;
-	required_device<floppy_image_device> m_floppy;
-	required_ioport m_address;
-	output_finder<2> m_leds;
-
-	// IEEE-488 bus
-	int m_nrfd_out;             // not ready for data
-	int m_ndac_out;             // not data accepted
-	int m_atna;                 // attention acknowledge
-	int m_ifc;
-
-	// interrupts
-	int m_via0_irq;             // VIA #0 interrupt request
-	int m_via1_irq;             // VIA #1 interrupt request
-};
-
-
-// device type definition
-DECLARE_DEVICE_TYPE(C2031, c2031_device)
+DECLARE_DEVICE_TYPE(GPIB_C2031, device_ieee488_interface)
 
 
 #endif // MAME_BUS_IEEE488_C2031_H