Previous 15994 Revisions Next

r2689 Wednesday 21st May, 2008 at 22:32:42 UTC by Fabio Priuli
[JUPITER] Converted to tagged inputs, simplified input handling, fixed keyboard layout and added natural keyboard support
[src/mess/drivers]jupiter.c
[src/mess/includes]jupiter.h
[src/mess/machine]jupiter.c

src/mess/includes/jupiter.h
r2688r2689
1717DEVICE_IMAGE_LOAD( jupiter_tap );
1818DEVICE_IMAGE_UNLOAD( jupiter_tap );
1919
20READ8_HANDLER( jupiter_port_fefe_r);
21READ8_HANDLER( jupiter_port_fdfe_r);
22READ8_HANDLER( jupiter_port_fbfe_r);
23READ8_HANDLER( jupiter_port_f7fe_r);
24READ8_HANDLER( jupiter_port_effe_r);
25READ8_HANDLER( jupiter_port_dffe_r);
26READ8_HANDLER( jupiter_port_bffe_r);
2720READ8_HANDLER( jupiter_port_7ffe_r);
2821WRITE8_HANDLER( jupiter_port_fe_w);
2922
src/mess/machine/jupiter.c
r2688r2689
9090   logerror("jupiter_init\r\n");
9191   logerror("data: %p\n", jupiter_data);
9292
93   if (input_port_read_indexed(machine, 8) != jupiter_ramsize)
93   if (input_port_read(machine, "CFG") != jupiter_ramsize)
9494   {
95      jupiter_ramsize = input_port_read_indexed(machine, 8);
95      jupiter_ramsize = input_port_read(machine, "CFG");
9696      switch (jupiter_ramsize)
9797      {
9898         case 03:
r2688r2689
272272   }
273273}
274274
275 READ8_HANDLER ( jupiter_port_fefe_r )
275READ8_HANDLER ( jupiter_port_7ffe_r )
276276{
277   return (input_port_read_indexed(machine, 0));
278}
279
280 READ8_HANDLER ( jupiter_port_fdfe_r )
281{
282   return (input_port_read_indexed(machine, 1));
283}
284
285 READ8_HANDLER ( jupiter_port_fbfe_r )
286{
287   return (input_port_read_indexed(machine, 2));
288}
289
290 READ8_HANDLER ( jupiter_port_f7fe_r )
291{
292   return (input_port_read_indexed(machine, 3));
293}
294
295 READ8_HANDLER ( jupiter_port_effe_r )
296{
297   return (input_port_read_indexed(machine, 4));
298}
299
300 READ8_HANDLER ( jupiter_port_dffe_r )
301{
302   return (input_port_read_indexed(machine, 5));
303}
304
305 READ8_HANDLER ( jupiter_port_bffe_r )
306{
307   return (input_port_read_indexed(machine, 6));
308}
309
310 READ8_HANDLER ( jupiter_port_7ffe_r )
311{
312277   speaker_level_w(0,0);
313   return (input_port_read_indexed(machine, 7));
278   return (input_port_read(machine, "KEY7"));
314279}
315280
316281WRITE8_HANDLER ( jupiter_port_fe_w )
src/mess/drivers/jupiter.c
r2688r2689
5252/* port i/o functions */
5353static ADDRESS_MAP_START( jupiter_io , ADDRESS_SPACE_IO, 8)
5454   AM_RANGE( 0x00fe, 0xfffe) AM_WRITE( jupiter_port_fe_w )
55   AM_RANGE( 0xfefe, 0xfefe) AM_READ( jupiter_port_fefe_r )
56   AM_RANGE( 0xfdfe, 0xfdfe) AM_READ( jupiter_port_fdfe_r )
57   AM_RANGE( 0xfbfe, 0xfbfe) AM_READ( jupiter_port_fbfe_r )
58   AM_RANGE( 0xf7fe, 0xf7fe) AM_READ( jupiter_port_f7fe_r )
59   AM_RANGE( 0xeffe, 0xeffe) AM_READ( jupiter_port_effe_r )
60   AM_RANGE( 0xdffe, 0xdffe) AM_READ( jupiter_port_dffe_r )
61   AM_RANGE( 0xbffe, 0xbffe) AM_READ( jupiter_port_bffe_r )
55   AM_RANGE( 0xfefe, 0xfefe) AM_READ_PORT( "KEY0" )
56   AM_RANGE( 0xfdfe, 0xfdfe) AM_READ_PORT( "KEY1" )
57   AM_RANGE( 0xfbfe, 0xfbfe) AM_READ_PORT( "KEY2" )
58   AM_RANGE( 0xf7fe, 0xf7fe) AM_READ_PORT( "KEY3" )
59   AM_RANGE( 0xeffe, 0xeffe) AM_READ_PORT( "KEY4" )
60   AM_RANGE( 0xdffe, 0xdffe) AM_READ_PORT( "KEY5" )
61   AM_RANGE( 0xbffe, 0xbffe) AM_READ_PORT( "KEY6" )
6262   AM_RANGE( 0x7ffe, 0x7ffe) AM_READ( jupiter_port_7ffe_r )
6363ADDRESS_MAP_END
6464
r2688r2689
9191/* keyboard input */
9292
9393static INPUT_PORTS_START (jupiter)
94   PORT_START   /* 0: 0xFEFE */
95   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_RSHIFT)
96   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SYM SHFT") PORT_CODE(KEYCODE_LSHIFT)
97   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
98   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
99   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
94   PORT_START_TAG("KEY0")   /* 0: 0xFEFE */
95   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT)      PORT_CHAR(UCHAR_SHIFT_1)
96   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Symbol Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_2)
97   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(':')
98   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR('\xA3')
99   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR('?')
100100
101   PORT_START   /* 1: 0xFDFE */
102   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
103   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
104   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
105   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
106   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
101   PORT_START_TAG("KEY1")   /* 1: 0xFDFE */
102   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR('~')
103   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR('|')
104   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR('\\')
105   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR('{')
106   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR('}')
107107
108   PORT_START   /* 2: 0xFBFE */
109   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
110   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
111   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
112   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
113   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
108   PORT_START_TAG("KEY2")   /* 2: 0xFBFE */
109   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')
110   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')
111   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')
112   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR('<')
113   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR('>')
114   PORT_START_TAG("KEY3")   /* 3: 0xF7FE */
115   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1') PORT_CHAR('!')
116   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2') PORT_CHAR('@')
117   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3') PORT_CHAR('#')
118   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4') PORT_CHAR('$')
119   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5') PORT_CHAR('%')
114120
115   PORT_START   /* 3: 0xF7FE */
116   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
117   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
118   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
119   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
120   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5)
121   PORT_START_TAG("KEY4")   /* 4: 0xEFFE */
122   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0') PORT_CHAR('_')
123   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')
124   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8') PORT_CHAR('(')
125   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')
126   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6') PORT_CHAR('&')
121127
122   PORT_START   /* 4: 0xEFFE */
123   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
124   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
125   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
126   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
127   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
128   PORT_START_TAG("KEY5")   /* 5: 0xDFFE */
129   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR('"')
130   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(';')
131   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I') PORT_CHAR(0x00A9)
132   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U') PORT_CHAR(']')
133   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y') PORT_CHAR('[')
128134
129   PORT_START   /* 5: 0xDFFE */
130   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
131   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
132   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
133   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
134   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
135   PORT_START_TAG("KEY6")   /* 6: 0xBFFE */
136   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)
137   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR('=')
138   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR('+')
139   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J') PORT_CHAR('-')
140   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("h  H  \xE2\x86\x91") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
135141
136   PORT_START   /* 6: 0xBFFE */
137   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER)
138   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
139   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
140   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
141   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
142   PORT_START_TAG("KEY7")   /* 7: 0x7FFE */
143   PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
144   PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)         PORT_CHAR('m') PORT_CHAR('M') PORT_CHAR('.')
145   PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)         PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(',')
146   PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR('*')
147   PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR('/')
142148
143   PORT_START   /* 7: 0x7FFE */
144   PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE)
145   PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
146   PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
147   PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
148   PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
149   PORT_START   /* 8: machine config */
149   PORT_START_TAG("CFG")   /* 8: machine config */
150150   PORT_DIPNAME( 0x03, 2, "RAM Size")
151   PORT_DIPSETTING(0, "3Kb")
152   PORT_DIPSETTING(1, "19Kb")
153   PORT_DIPSETTING(2, "49Kb")
151   PORT_DIPSETTING(   0, "3Kb")
152   PORT_DIPSETTING(   1, "19Kb")
153   PORT_DIPSETTING(   2, "49Kb")
154154INPUT_PORTS_END
155155
156156/* Sound output */

Previous 15994 Revisions Next


© 1998-2018 The MESS Team