Previous 15994 Revisions Next

r2846 Friday 13th June, 2008 at 01:07:48 UTC by Nathan Woods
[APPLE2] Cleanups and fixed overlapping port fields
[src/mess/drivers]apple2.c apple3.c
[src/mess/includes]apple2.h
[src/mess/machine]apple2.c ay3600.c

src/mess/includes/apple2.h
r2845r2846
1212#include "machine/applefdc.h"
1313
1414
15/* -----------------------------------------------------------------------
16 * Softswitch values
17 * ----------------------------------------------------------------------- */
15/***************************************************************************
16    SOFTSWITCH VALUES
17***************************************************************************/
1818
1919#define VAR_80STORE      0x000001
2020#define VAR_RAMRD      0x000002
r2845r2846
3939
4040#define VAR_DHIRES      VAR_AN3
4141
42
43/***************************************************************************
44    SPECIAL KEYS
45***************************************************************************/
46
47#define SPECIALKEY_CAPSLOCK      0x01
48#define SPECIALKEY_SHIFT      0x06
49#define SPECIALKEY_CONTROL      0x08
50#define SPECIALKEY_BUTTON0      0x10   /* open apple */
51#define SPECIALKEY_BUTTON1      0x20   /* closed apple */
52#define SPECIALKEY_BUTTON2      0x40
53#define SPECIALKEY_RESET      0x80
54
55
56/***************************************************************************
57    OTHER
58***************************************************************************/
59
4260/*----------- defined in machine/apple2.c -----------*/
4361
4462extern UINT32 a2;
r2845r2846
5876
5977void apple2_setvar(running_machine *machine, UINT32 val, UINT32 mask);
6078
79int apple2_pressed_specialkey(running_machine *machine, UINT8 key);
6180
81
6282/*----------- defined in video/apple2.c -----------*/
6383
6484void apple2_video_start(running_machine *machine, const UINT8 *vram, size_t vram_size, UINT32 ignored_softswitches, int hires_modulo);
r2845r2846
7191int apple2_get_fgcolor(void);
7292int apple2_get_bgcolor(void);
7393
74/* keyboard wrappers */
75#define pressed_specialkey(key)   (input_port_read(machine, "keyb_special") & (key))
76#define SPECIALKEY_CAPSLOCK      0x01
77#define SPECIALKEY_SHIFT      0x06
78#define SPECIALKEY_CONTROL      0x08
79#define SPECIALKEY_BUTTON0      0x10   /* open apple */
80#define SPECIALKEY_BUTTON1      0x20   /* closed apple */
81#define SPECIALKEY_BUTTON2      0x40
82#define SPECIALKEY_RESET      0x80
83
8494/* -----------------------------------------------------------------------
8595 * New Apple II memory manager
8696 * ----------------------------------------------------------------------- */
src/mess/machine/ay3600.c
r2845r2846
1919#include "machine/ay3600.h"
2020#include "includes/apple2.h"
2121
22
23/***************************************************************************
24    PARAMETERS
25***************************************************************************/
26
2227#ifdef MAME_DEBUG
2328#define VERBOSE 1
2429#else
r2845r2846
2732
2833#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
2934
35
36
37/**************************************************************************/
38
3039static TIMER_CALLBACK(AY3600_poll);
3140
3241static int AY3600_keyboard_queue_chars(const unicode_char *text, size_t text_len);
r2845r2846
273282#define A2_KEYMOD_COMMAND   0x40
274283#define A2_KEYMOD_OPTION   0x80
275284
285
286
276287/***************************************************************************
277  Helper Functions
288    HELPER FUNCTIONS
278289***************************************************************************/
279290
280291INLINE int a2_has_keypad(running_machine *machine)
r2845r2846
304315}
305316
306317
307
308318/***************************************************************************
309319  AY3600_init
310320***************************************************************************/
r2845r2846
365375      time_until_repeat = input_port_read(machine, "keyb_repeat") & 0x01 ? 0 : ~0;
366376
367377   /* check caps lock and set LED here */
368   if (pressed_specialkey(SPECIALKEY_CAPSLOCK))
378   if (apple2_pressed_specialkey(machine, SPECIALKEY_CAPSLOCK))
369379   {
370380      caps_lock = 1;
371381      set_led_status(1,1);
r2845r2846
381391   switchkey = A2_KEY_NORMAL;
382392
383393   /* shift key check */
384   if (pressed_specialkey(SPECIALKEY_SHIFT))
394   if (apple2_pressed_specialkey(machine, SPECIALKEY_SHIFT))
385395   {
386396      switchkey |= A2_KEY_SHIFT;
387397      keymodreg |= A2_KEYMOD_SHIFT;
r2845r2846
392402   }
393403
394404   /* control key check - only one control key on the left side on the Apple */
395   if (pressed_specialkey(SPECIALKEY_CONTROL))
405   if (apple2_pressed_specialkey(machine, SPECIALKEY_CONTROL))
396406   {
397407      switchkey |= A2_KEY_CONTROL;
398408      keymodreg |= A2_KEYMOD_CONTROL;
r2845r2846
403413   }
404414
405415   /* apple key check */
406   if (pressed_specialkey(SPECIALKEY_BUTTON0))
416   if (apple2_pressed_specialkey(machine, SPECIALKEY_BUTTON0))
407417   {
408418      keymodreg |= A2_KEYMOD_COMMAND;
409419   }
r2845r2846
413423   }
414424
415425   /* option key check */
416   if (pressed_specialkey(SPECIALKEY_BUTTON1))
426   if (apple2_pressed_specialkey(machine, SPECIALKEY_BUTTON1))
417427   {
418428      keymodreg |= A2_KEYMOD_OPTION;
419429   }
r2845r2846
423433   }
424434
425435   /* reset key check */
426   if (pressed_specialkey(SPECIALKEY_RESET) &&
436   if (apple2_pressed_specialkey(machine, SPECIALKEY_RESET) &&
427437      (a2_no_ctrl_reset(machine) || switchkey & A2_KEY_CONTROL)) {
428438         if (!reset_flag) {
429439            reset_flag = 1;
src/mess/machine/apple2.c
r2845r2846
10251025   {
10261026      case 0x01:
10271027         /* Open-Apple/Joystick button 0 */
1028         result = pressed_specialkey(SPECIALKEY_BUTTON0);
1028         result = apple2_pressed_specialkey(machine, SPECIALKEY_BUTTON0);
10291029         break;
10301030      case 0x02:
10311031         /* Closed-Apple/Joystick button 1 */
1032         result = pressed_specialkey(SPECIALKEY_BUTTON1);
1032         result = apple2_pressed_specialkey(machine, SPECIALKEY_BUTTON1);
10331033         break;
10341034      case 0x03:
10351035         /* Joystick button 2. Later revision motherboards connected this to SHIFT also */
1036         result = pressed_specialkey(SPECIALKEY_BUTTON2);
1036         result = apple2_pressed_specialkey(machine, SPECIALKEY_BUTTON2);
10371037         break;
10381038      case 0x04:
10391039         /* X Joystick 1 axis */
r2845r2846
13171317   /* perform initial reset */
13181318   apple2_reset(machine);
13191319}
1320
1321
1322
1323int apple2_pressed_specialkey(running_machine *machine, UINT8 key)
1324{
1325   return (input_port_read(machine, "keyb_special") & key)
1326      || (input_port_read(machine, "joystick_buttons") & key);
1327}
src/mess/drivers/apple3.c
r2845r2846
135135    PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control")      PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
136136    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
137137    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
138    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_0_PAD)   PORT_CODE(JOYCODE_BUTTON1)
139    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_ENTER_PAD)PORT_CODE(JOYCODE_BUTTON2)
140    PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(2)         PORT_CODE(JOYCODE_BUTTON1)
141138    PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET")      PORT_CODE(KEYCODE_F12)
142139INPUT_PORTS_END
143140
src/mess/drivers/apple2.c
r2845r2846
258258   PORT_CENTERDELTA(JOYSTICK_AUTOCENTER)
259259   PORT_MINMAX(0,0xff) PORT_PLAYER(2)
260260   PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH)      PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH)
261
262   PORT_START_TAG("joystick_buttons")
263    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_0_PAD)   PORT_CODE(JOYCODE_BUTTON1)
264    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_ENTER_PAD)PORT_CODE(JOYCODE_BUTTON2)
265    PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(2)         PORT_CODE(JOYCODE_BUTTON1)
261266INPUT_PORTS_END
262267
263268static INPUT_PORTS_START( apple2_paddle )
r2845r2846
301306   //PORT_INCLUDE( apple2_paddle )
302307INPUT_PORTS_END
303308
304static INPUT_PORTS_START( apple2 )
309static INPUT_PORTS_START( apple2_common )
305310    PORT_START_TAG("keyb_0")
306311    PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
307312    PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x90")      PORT_CODE(KEYCODE_LEFT)
r2845r2846
379384    PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control")      PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
380385    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
381386    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
382    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_0_PAD)   PORT_CODE(JOYCODE_BUTTON1)
383    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_ENTER_PAD)PORT_CODE(JOYCODE_BUTTON2)
384    PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(2)         PORT_CODE(JOYCODE_BUTTON1)
385387    PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET")      PORT_CODE(KEYCODE_F12)
388INPUT_PORTS_END
386389
390static INPUT_PORTS_START( apple2 )
391   PORT_INCLUDE(apple2_common)
392
387393   PORT_START_TAG("keyb_repeat")
388394    PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("REPT")         PORT_CODE(KEYCODE_BACKSLASH)PORT_CHAR('\\')
389395
r2845r2846
400406   PORT_DIPSETTING( 0x00, "RESET" )
401407INPUT_PORTS_END
402408
403static INPUT_PORTS_START( apple2_common )
409static INPUT_PORTS_START( apple2e_common )
404410    PORT_START_TAG("keyb_0")
405411    PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Delete")   PORT_CODE(KEYCODE_BACKSPACE)PORT_CHAR(8)
406412    PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x90")      PORT_CODE(KEYCODE_LEFT)
r2845r2846
470476    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)    PORT_CHAR('X') PORT_CHAR('x')
471477    PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)    PORT_CHAR('Y') PORT_CHAR('y')
472478    PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)   PORT_CHAR('Z') PORT_CHAR('z')
479
480   PORT_START_TAG("keyb_special")
481    PORT_BIT( 0x01, IP_ACTIVE_LOW,  IPT_KEYBOARD) PORT_NAME("Caps Lock")   PORT_CODE(KEYCODE_CAPSLOCK)   PORT_TOGGLE
482    PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Shift")   PORT_CODE(KEYCODE_LSHIFT)   PORT_CHAR(UCHAR_SHIFT_1)
483    PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Shift")   PORT_CODE(KEYCODE_RSHIFT)   PORT_CHAR(UCHAR_SHIFT_1)
484    PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control")      PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
485    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Open Apple")   PORT_CODE(KEYCODE_LALT)
486    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Solid Apple")   PORT_CODE(KEYCODE_RALT)
487    PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET")      PORT_CODE(KEYCODE_F12)
473488INPUT_PORTS_END
474489
475490static INPUT_PORTS_START( apple2_keypad )
r2845r2846
494509   PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD)   PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))
495510INPUT_PORTS_END
496511
497static INPUT_PORTS_START( apple2_special )
498    PORT_START_TAG("keyb_special")
499    PORT_BIT( 0x01, IP_ACTIVE_LOW,  IPT_KEYBOARD) PORT_NAME("Caps Lock")   PORT_CODE(KEYCODE_CAPSLOCK)   PORT_TOGGLE
500    PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Shift")   PORT_CODE(KEYCODE_LSHIFT)   PORT_CHAR(UCHAR_SHIFT_1)
501    PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Shift")   PORT_CODE(KEYCODE_RSHIFT)   PORT_CHAR(UCHAR_SHIFT_1)
502    PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control")      PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_SHIFT_2)
503    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Open Apple")   PORT_CODE(KEYCODE_LALT)
504    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Solid Apple")   PORT_CODE(KEYCODE_RALT)
505    PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_0_PAD)   PORT_CODE(JOYCODE_BUTTON1)
506    PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2)  PORT_PLAYER(1)         PORT_CODE(KEYCODE_ENTER_PAD)PORT_CODE(JOYCODE_BUTTON2)
507    PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1)  PORT_PLAYER(2)         PORT_CODE(JOYCODE_BUTTON1)
508    PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET")      PORT_CODE(KEYCODE_F12)
509INPUT_PORTS_END
510
511512static INPUT_PORTS_START( apple2e )
512   PORT_INCLUDE( apple2_common )
513   PORT_INCLUDE( apple2_special )
513   PORT_INCLUDE( apple2e_common )
514514   PORT_INCLUDE( apple2_gameport )
515515INPUT_PORTS_END
516516
517517INPUT_PORTS_START( apple2ep )
518   PORT_INCLUDE( apple2_common )
519   PORT_INCLUDE( apple2_keypad )
520   PORT_INCLUDE( apple2_special )
518   PORT_INCLUDE( apple2e_common )
521519   PORT_INCLUDE( apple2_gameport )
520   PORT_INCLUDE( apple2_keypad )
522521INPUT_PORTS_END
523522
524523/* according to Steve Nickolas (author of Dapple), our original palette would

Previous 15994 Revisions Next


© 1998-2018 The MESS Team