MESS SVN History

15994 Revisions

r2289 Sunday 6th April, 2008 at 02:45:33 UTC by Firewave
Machine -> machine cleanups

[src/mess/drivers]	ti990_10.c ti990_4.c
[src/mess/machine]	mz700.c sms.c ti990.c ti990.h vc20.c
[src/mess/video]	amstrad.c

src/mess/video/amstrad.c
r2288	r2289
44	44	static int amstrad_plus_split_address;
45	45	static int amstrad_screen_width; // width in bytes
46	46
47		static void amstrad_plus_handle_dma(void);
	47	static void amstrad_plus_handle_dma(running_machine *machine);
48	48
49	49	extern int aleste_mode;
50	50
r2288	r2289
976	976	4020h STOP Stop processing the sound list.
977	977	*/
978	978
979		static void amstrad_plus_dma_parse(int channel, int *addr)
	979	static void amstrad_plus_dma_parse(running_machine machine, int channel, int addr)
980	980	{
981	981	unsigned short command;
982		running_machine *machine = Machine;
983	982
984	983	if(*addr & 0x01)
985	984	(*addr)++; // align to even address
r2288	r2289
1044	1043	(*addr)+=2; // point to next DMA instruction
1045	1044	}
1046	1045
1047		static void amstrad_plus_handle_dma()
	1046	static void amstrad_plus_handle_dma(running_machine *machine)
1048	1047	{
1049	1048	if(amstrad_plus_dma_status & 0x01) // DMA channel 0
1050		amstrad_plus_dma_parse(0,&amstrad_plus_dma_0_addr);
	1049	amstrad_plus_dma_parse(machine,0,&amstrad_plus_dma_0_addr);
1051	1050
1052	1051	if(amstrad_plus_dma_status & 0x02) // DMA channel 1
1053		amstrad_plus_dma_parse(1,&amstrad_plus_dma_1_addr);
	1052	amstrad_plus_dma_parse(machine,1,&amstrad_plus_dma_1_addr);
1054	1053
1055	1054	if(amstrad_plus_dma_status & 0x04) // DMA channel 2
1056		amstrad_plus_dma_parse(2,&amstrad_plus_dma_2_addr);
	1055	amstrad_plus_dma_parse(machine,2,&amstrad_plus_dma_2_addr);
1057	1056	}
1058	1057
1059	1058	/************************************************************************
r2288	r2289
1211	1210	border_counter = 1; // border extended to cover garbage data from using the soft scroll functions
1212	1211	}
1213	1212	// CPC+/GX4000 DMA channels
1214		amstrad_plus_handle_dma(); // a DMA command is handled at the leading edge of HSYNC (every 64us)
	1213	amstrad_plus_handle_dma(machine); // a DMA command is handled at the leading edge of HSYNC (every 64us)
1215	1214	}
1216	1215	}
1217	1216	amstrad_CRTC_HS = data;

src/mess/machine/mz700.c
r2288	r2289
11	11
12	12	/* Core includes */
13	13	#include "driver.h"
14		#include "deprecat.h"
15	14	#include "includes/mz700.h"
16	15
17	16	/* Components */
r2288	r2289
124	123	{
125	124	/* INTMSK: interrupt enabled? */
126	125	if (pio_port_c_output & 0x04)
127		cpunum_set_input_line(Machine, 0, 0, HOLD_LINE);
	126	cpunum_set_input_line(device->machine, 0, 0, HOLD_LINE);
128	127	}
129	128
130	129	/********************** PIO **********************************************/

src/mess/machine/ti990.c
r2288	r2289
82	82	cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE);
83	83	}
84	84
85		void ti990_hold_load(void)
	85	void ti990_hold_load(running_machine *machine)
86	86	{
87		cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, ASSERT_LINE);
	87	cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE);
88	88	timer_set(ATTOTIME_IN_MSEC(100), NULL, 0, clear_load);
89	89	}
90	90

src/mess/machine/ti990.h
r2288	r2289
12	12	void ti990_set_int10(int state);
13	13	void ti990_set_int13(int state);
14	14
15		void ti990_hold_load(void);
	15	void ti990_hold_load(running_machine *machine);
16	16
17	17	READ8_HANDLER ( ti990_panel_read );
18	18	WRITE8_HANDLER ( ti990_panel_write );

src/mess/machine/vc20.c
r2288	r2289
685	685	}
686	686
687	687	logerror("loading rom %s at %.4x size:%.4x\n",image_filename(image), addr, size);
688		read_ = image_fread(image, new_memory_region( Machine, REGION_USER1, ( size & 0x1FFF ) ? ( size + 0x2000 ) : size, 0 ), size);
	688	read_ = image_fread(image, new_memory_region( image->machine, REGION_USER1, ( size & 0x1FFF ) ? ( size + 0x2000 ) : size, 0 ), size);
689	689	if (read_ != size)
690	690	return 1;
691	691

src/mess/machine/sms.c
r2288	r2289
1	1	#include "driver.h"
2		#include "deprecat.h"
3	2	#include "image.h"
4	3	#include "includes/sms.h"
5	4	#include "video/smsvdp.h"
r2288	r2289
737	736	}
738	737
739	738	DEVICE_START( sms_cart ) {
740		running_machine *machine = Machine;
	739	running_machine *machine = device->machine;
741	740	int i;
742	741
743	742	for ( i = 0; i < MAX_CARTRIDGES; i++ ) {
r2288	r2289
764	763
765	764	DEVICE_IMAGE_LOAD( sms_cart )
766	765	{
767		running_machine *machine = Machine;
	766	running_machine *machine = image->machine;
768	767	int size = image_length(image);
769	768	int index = image_index_in_device( image );
770	769	const char *fname = image_filename( image );

src/mess/drivers/ti990_4.c
r2288	r2289
48	48
49	49	static MACHINE_RESET(ti990_4)
50	50	{
51		ti990_hold_load();
	51	ti990_hold_load(machine);
52	52
53	53	ti990_reset_int();
54	54
r2288	r2289
95	95	static WRITE8_HANDLER ( lrex_callback )
96	96	{
97	97	/* right??? */
98		ti990_hold_load();
	98	ti990_hold_load(machine);
99	99	}
100	100
101	101	#if VIDEO_911

src/mess/drivers/ti990_10.c
r2288	r2289
68	68	*/
69	69
70	70	#include "driver.h"
	71	#include "deprecat.h"
71	72	#include "cpu/tms9900/tms9900.h"
72	73	#include "machine/ti990.h"
73	74	#include "machine/990_hd.h"
r2288	r2289
76	77
77	78	static MACHINE_RESET( ti990_10 )
78	79	{
79		ti990_hold_load();
	80	ti990_hold_load(machine);
80	81
81	82	ti990_reset_int();
82	83
r2288	r2289
108	109	static void lrex_callback(void)
109	110	{
110	111	/* right??? */
111		ti990_hold_load();
	112	ti990_hold_load(Machine);
112	113	}
113	114
114	115	/*

15994 Revisions