Previous

199869 Revisions

Next

r41800 Thursday 19th November, 2015 at 21:16:57 UTC by Ryan Holtz
Still more this==NULL cleanup

[/branches/code_cleanup/src/devices/sound]	c140.cpp c140.h ymf271.cpp ymf271.h
[/branches/code_cleanup/src/emu]	diimage.cpp
[/branches/code_cleanup/src/emu/bus/rs232]	petitevid.h*
[/branches/code_cleanup/src/mame/drivers]	kaneko16.cpp segas24.cpp
[/branches/code_cleanup/src/mame/includes]	segas24.h

branches/code_cleanup/src/devices/sound/c140.cpp

r250311	r250312
87	87	//-------------------------------------------------
88	88
89	89	c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
90		: device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__),
91		device_sound_interface(mconfig, *this),
92		m_sample_rate(0),
93		m_stream(NULL),
94		m_banking_type(0),
95		m_mixer_buffer_left(NULL),
96		m_mixer_buffer_right(NULL),
97		m_baserate(0),
98		m_pRom(NULL)
	90	: device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__)
	91	, device_sound_interface(mconfig, *this)
	92	, m_sample_rate(0)
	93	, m_stream(NULL)
	94	, m_banking_type(0)
	95	, m_mixer_buffer_left(NULL)
	96	, m_mixer_buffer_right(NULL)
	97	, m_baserate(0)
	98	, m_rom_region(*this, tag)
	99	, m_pRom(NULL)
99	100	{
100	101	memset(m_REG, 0, sizeof(UINT8)*0x200);
101	102	memset(m_pcmtbl, 0, sizeof(INT16)*8);
r250311	r250312
112	113
113	114	m_stream = stream_alloc(0, 2, m_sample_rate);
114	115
115		m_pRom = (INT8 *)region()->base();
	116	if (m_rom_region)
	117	{
	118	m_pRom = (INT8 *)m_rom_region->base();
	119	}
116	120
117	121	/* make decompress pcm table */     //2000.06.26 CAB
118	122	{

branches/code_cleanup/src/devices/sound/c140.h

r250311	r250312
110	110	INT16 *m_mixer_buffer_right;
111	111
112	112	int m_baserate;
	113	optional_memory_region m_rom_region;
113	114	INT8 *m_pRom;
114	115	UINT8 m_REG[0x200];
115	116

branches/code_cleanup/src/devices/sound/ymf271.cpp

r250311	r250312
1706	1706	m_timA = timer_alloc(0);
1707	1707	m_timB = timer_alloc(1);
1708	1708
1709		m_mem_base = region()->base();
1710		m_mem_size = region()->bytes();
	1709	if (m_mem_region != NULL)
	1710	{
	1711	m_mem_base = m_mem_region->base();
	1712	m_mem_size = m_mem_region->bytes();
	1713	}
1711	1714	m_irq_handler.resolve();
1712	1715
1713	1716	m_ext_read_handler.resolve();
r250311	r250312
1747	1750	const device_type YMF271 = &device_creator<ymf271_device>;
1748	1751
1749	1752	ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
1750		: device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__),
1751		device_sound_interface(mconfig, *this),
1752		m_timerA(0),
1753		m_timerB(0),
1754		m_irqstate(0),
1755		m_status(0),
1756		m_enable(0),
1757		m_ext_address(0),
1758		m_ext_rw(0),
1759		m_ext_readlatch(0),
1760		m_irq_handler(*this),
1761		m_ext_read_handler(*this),
1762		m_ext_write_handler(*this)
	1753	: device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__)
	1754	, device_sound_interface(mconfig, *this)
	1755	, m_timerA(0)
	1756	, m_timerB(0)
	1757	, m_irqstate(0)
	1758	, m_status(0)
	1759	, m_enable(0)
	1760	, m_ext_address(0)
	1761	, m_ext_rw(0)
	1762	, m_ext_readlatch(0)
	1763	, m_mem_base(NULL)
	1764	, m_mem_size(0)
	1765	, m_clock(0)
	1766	, m_timA(NULL)
	1767	, m_timB(NULL)
	1768	, m_stream(NULL)
	1769	, m_mix_buffer(NULL)
	1770	, m_irq_handler(*this)
	1771	, m_ext_read_handler(*this)
	1772	, m_ext_write_handler(*this)
	1773	, m_mem_region(*this, tag)
1763	1774	{
1764	1775	memset(m_slots, 0, sizeof(m_slots));
1765	1776	memset(m_groups, 0, sizeof(m_groups));

branches/code_cleanup/src/devices/sound/ymf271.h

r250311	r250312
151	151	UINT32 m_mem_size;
152	152	UINT32 m_clock;
153	153
154		emu_timer *m_timA, *m_timB;
	154	emu_timer *m_timA;
	155	emu_timer *m_timB;
155	156	sound_stream *m_stream;
156	157	INT32 *m_mix_buffer;
157	158
158	159	devcb_write_line m_irq_handler;
159	160	devcb_read8 m_ext_read_handler;
160	161	devcb_write8 m_ext_write_handler;
	162
	163	optional_memory_region m_mem_region;
161	164	};
162	165
163	166	extern const device_type YMF271;

branches/code_cleanup/src/emu/bus/rs232/petitevid.h

r0	r250312
	1	// license:BSD-3-Clause
	2	// copyright-holders:smf
	3	#ifndef __RS232_PETITEVID_H__
	4	#define __RS232_PETITEVID_H__
	5
	6	#include "rs232.h"
	7	#include "machine/terminal.h"
	8
	9
	10	class rs232_petitevid_device : public device_serial_interface,
	11	public device_rs232_port_interface
	12	{
	13	public:
	14	rs232_petitevid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
	15
	16	virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); }
	17
	18	DECLARE_WRITE_LINE_MEMBER(update_serial);
	19
	20	protected:
	21	virtual ioport_constructor device_input_ports() const;
	22	virtual void device_start();
	23	virtual void device_reset();
	24	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
	25
	26	virtual void tra_callback();
	27	virtual void tra_complete();
	28	virtual void rcv_complete();
	29	virtual void send_key(UINT8 code);
	30
	31	private:
	32	required_ioport m_rs232_txbaud;
	33	required_ioport m_rs232_rxbaud;
	34	required_ioport m_rs232_startbits;
	35	required_ioport m_rs232_databits;
	36	required_ioport m_rs232_parity;
	37	required_ioport m_rs232_stopbits;
	38
	39	UINT8 m_curr_key;
	40	bool m_key_valid;
	41	};
	42
	43	extern const device_type SERIAL_TERMINAL;
	44
	45	#endif /* __RS232_TERMINAL_H__ */

branches/code_cleanup/src/emu/diimage.cpp

r250311	r250312
59	59	m_file(NULL),
60	60	m_mame_file(NULL),
61	61	m_software_info_ptr(NULL),
62		m_software_part_ptr(NULL),
	62	m_software_part_ptr(NULL),
63	63	m_supported(0),
64	64	m_readonly(false),
65		m_created(false),
66		m_init_phase(false),
67		m_from_swlist(false),
68		m_create_format(0),
	65	m_created(false),
	66	m_init_phase(false),
	67	m_from_swlist(false),
	68	m_create_format(0),
69	69	m_create_args(NULL),
70	70	m_is_loading(FALSE)
71	71	{
r250311	r250312
378	378	return NULL;
379	379
380	380	sprintf( full_tag, "%s:%s", device().tag(), tag );
381		return device().machine().root_device().memregion( full_tag )->base();
	381
	382	memory_region *region = device().machine().root_device().memregion(full_tag);
	383	return region != NULL ? region->base() : NULL;
382	384	}
383	385
384	386

branches/code_cleanup/src/mame/drivers/kaneko16.cpp

r250311	r250312
2315	2315	*/
2316	2316	void kaneko16_state::kaneko16_unscramble_tiles(const char *region)
2317	2317	{
2318		UINT8 *RAM  =   memregion(region)->base();
2319		int size            =   memregion(region)->bytes();
2320		int i;
	2318	memory_region *tile_region = memregion(region);
	2319	if (tile_region == NULL)
	2320	{
	2321	return;
	2322	}
2321	2323
2322		if (RAM == NULL)    return;
	2324	UINT8 *ram = tile_region->base();
	2325	int size = tile_region->bytes();
2323	2326
2324		for (i = 0; i < size; i ++)
	2327	for (int i = 0; i < size; i ++)
2325	2328	{
2326		RAM[i] = ((RAM[i] & 0xF0)>>4) + ((RAM[i] & 0x0F)<<4);
	2329	ram[i] = ((ram[i] & 0xF0) >> 4) + ((ram[i] & 0x0F) << 4);
2327	2330	}
2328	2331	}
2329	2332

branches/code_cleanup/src/mame/drivers/segas24.cpp

r250311	r250312
714	714
715	715	void segas24_state::reset_bank()
716	716	{
717		if (memregion("romboard")->base())
	717	if (m_romboard != NULL)
718	718	{
719	719	membank("bank1")->set_entry(curbank & 15);
720	720	membank("bank2")->set_entry(curbank & 15);
r250311	r250312
1263	1263	if (track_size)
1264	1264	machine().device<nvram_device>("floppy_nvram")->set_base(memregion("floppy")->base(), 2*track_size);
1265	1265
1266		UINT8 *usr1 = memregion("romboard")->base();
1267		if (usr1)
	1266	if (m_romboard != NULL)
1268	1267	{
	1268	UINT8 *usr1 = m_romboard->base();
1269	1269	membank("bank1")->configure_entries(0, 16, usr1, 0x40000);
1270	1270	membank("bank2")->configure_entries(0, 16, usr1, 0x40000);
1271	1271	}

branches/code_cleanup/src/mame/includes/segas24.h

r250311	r250312
12	12	{
13	13	public:
14	14	segas24_state(const machine_config &mconfig, device_type type, const char *tag)
15		: driver_device(mconfig, type, tag) ,
16		m_maincpu(*this, "maincpu"),
17		m_subcpu(*this, "subcpu"),
18		m_dac(*this, "dac"),
19		m_screen(*this, "screen"),
20		m_palette(*this, "palette"),
21		m_generic_paletteram_16(*this, "paletteram")
22		{ }
	15	: driver_device(mconfig, type, tag)
	16	, m_maincpu(*this, "maincpu")
	17	, m_subcpu(*this, "subcpu")
	18	, m_dac(*this, "dac")
	19	, m_screen(*this, "screen")
	20	, m_palette(*this, "palette")
	21	, m_generic_paletteram_16(*this, "paletteram")
	22	, m_romboard(*this, "romboard")
	23	{
	24	}
23	25
24	26	required_device<cpu_device> m_maincpu;
25	27	required_device<cpu_device> m_subcpu;
r250311	r250312
27	29	required_device<screen_device> m_screen;
28	30	required_device<palette_device> m_palette;
29	31	required_shared_ptr<UINT16> m_generic_paletteram_16;
	32	optional_memory_region m_romboard;
30	33
31	34	static const UINT8  mahmajn_mlt[8];
32	35	static const UINT8 mahmajn2_mlt[8];

https://github.com/mamedev/mame/commit/08a4480a7d61e744aa8c1745d37e028afdc5e2aa

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team