summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/apricot/expansion/expansion.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/apricot/expansion/expansion.h')
-rw-r--r--src/devices/bus/apricot/expansion/expansion.h43
1 files changed, 16 insertions, 27 deletions
diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h
index 72746b7160e..21b991ed810 100644
--- a/src/devices/bus/apricot/expansion/expansion.h
+++ b/src/devices/bus/apricot/expansion/expansion.h
@@ -54,32 +54,32 @@
#define MCFG_EXPANSION_ADD(_tag, _cpu_tag) \
MCFG_DEVICE_ADD(_tag, APRICOT_EXPANSION_BUS, 0) \
- apricot_expansion_bus_device::set_cpu_tag(*device, this, _cpu_tag);
+ downcast<apricot_expansion_bus_device &>(*device).set_cpu_tag(this, _cpu_tag);
#define MCFG_EXPANSION_IOP_ADD(_tag) \
- apricot_expansion_bus_device::set_iop_tag(*device, this, _tag);
+ downcast<apricot_expansion_bus_device &>(*device).set_iop_tag(this, _tag);
#define MCFG_EXPANSION_SLOT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, APRICOT_EXPANSION_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
#define MCFG_EXPANSION_DMA1_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_dma1_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_dma1_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_DMA2_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_dma2_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_dma2_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_EXT1_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_ext1_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_ext1_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_EXT2_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_ext2_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_ext2_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_INT2_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_int2_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_int2_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_INT3_HANDLER(_devcb) \
- devcb = &apricot_expansion_bus_device::set_int3_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<apricot_expansion_bus_device &>(*device).set_int3_handler(DEVCB_##_devcb);
//**************************************************************************
@@ -118,27 +118,16 @@ public:
apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~apricot_expansion_bus_device();
- template <class Object> static devcb_base &set_dma1_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_dma1_handler.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_dma2_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_dma2_handler.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_ext1_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_ext1_handler.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_ext2_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_ext2_handler.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_int2_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_int2_handler.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_int3_handler(device_t &device, Object &&cb)
- { return downcast<apricot_expansion_bus_device &>(device).m_int3_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_dma1_handler(Object &&cb) { return m_dma1_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_dma2_handler(Object &&cb) { return m_dma2_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_ext1_handler(Object &&cb) { return m_ext1_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_ext2_handler(Object &&cb) { return m_ext2_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_int2_handler(Object &&cb) { return m_int2_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_int3_handler(Object &&cb) { return m_int3_handler.set_callback(std::forward<Object>(cb)); }
// inline configuration
- static void set_cpu_tag(device_t &device, device_t *owner, const char *tag);
- static void set_iop_tag(device_t &device, device_t *owner, const char *tag);
+ void set_cpu_tag(device_t *owner, const char *tag) { m_cpu_tag = tag; }
+ void set_iop_tag(device_t *owner, const char *tag) { m_iop_tag = tag; }
void add_card(device_apricot_expansion_card_interface *card);
noreply.github.com> 2018-01-05 10:47:21 -0500 committer AJR <ajrhacker@users.noreply.github.com> 2018-01-05 10:47:28 -0500 Privatize m_screen and other variables of device_video_interface (nw)' href='/mame/commit/src/devices/video/cdp1861.cpp?id=aa45e908bbf1c6ac8141b1990500817699888b59'>aa45e908bbf
2d45dec8707
5b8e012b828


71d40f615bd
5b8e012b828
2d45dec8707


5b8e012b828








aa45e908bbf
5b8e012b828



0f0d39ef815
5b8e012b828


2d45dec8707
5b8e012b828

aa45e908bbf
5b8e012b828




2d45dec8707
5b8e012b828

aa45e908bbf
5b8e012b828





0f0d39ef815
2d45dec8707
aa45e908bbf
5b8e012b828

0f0d39ef815
2d45dec8707
aa45e908bbf
5b8e012b828

0f0d39ef815
2d45dec8707
aa45e908bbf
5b8e012b828

0f0d39ef815
2d45dec8707
aa45e908bbf
5b8e012b828








0f0d39ef815
5b8e012b828
2d45dec8707
5b8e012b828


2d45dec8707
5b8e012b828
302dc32c634
5b8e012b828




0f0d39ef815
5b8e012b828
2d45dec8707
5b8e012b828


2d45dec8707
5b8e012b828
302dc32c634
5b8e012b828






e91993f24e6
5b8e012b828



aa45e908bbf

5b8e012b828



7d41a1f619f
9f0f40759bf
5b8e012b828





e91993f24e6
5b8e012b828










e91993f24e6
5b8e012b828







2d45dec8707

5b8e012b828



e4238fb654d
5b8e012b828

ddb290d5f61
5b8e012b828


e4238fb654d
5b8e012b828


b83078eb461
5b8e012b828
e4238fb654d
5b8e012b828
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253