Previous 199869 Revisions Next

r26770 Thursday 26th December, 2013 at 23:15:53 UTC by smf
removed mfp_init() and the variables it sets as they aren't used. keyboard reading is still hacked and doesn't go through 68901 device. (nw)
[src/mess/drivers]x68k.c
[src/mess/includes]x68k.h

trunk/src/mess/includes/x68k.h
r26769r26770
132132   struct
133133   {
134134      int aer;   // [1]  GPIP active edge register.  Determines on which transition an IRQ is triggered.  0 = 1->0
135      int tadr;  // [15] Timer A data register
136      int tbdr;  // [16] Timer B data register
137      int tcdr;  // [17] Timer C data register
138      int tddr;  // [18] Timer D data register
139135      int rsr;   // [21] Receiver status register
140136      int tsr;   // [22] Transmitter status register
141137      struct
r26769r26770
145141         int recv_enable;
146142         int send_enable;
147143      } usart;
148      int irqline;
149      int current_irq;
150144      unsigned char gpio;
151145   } m_mfp;  // MC68901 Multifunction Peripheral (4MHz)
152146   struct
r26769r26770
304298   DECLARE_WRITE_LINE_MEMBER(x68k_scsi_irq);
305299   DECLARE_WRITE_LINE_MEMBER(x68k_scsi_drq);
306300
307   void mfp_init();
308301   void x68k_keyboard_ctrl_w(int data);
309302   int x68k_keyboard_pop_scancode();
310303   void x68k_keyboard_push_scancode(unsigned char code);
trunk/src/mess/drivers/x68k.c
r26769r26770
140140
141141
142142
143void x68k_state::mfp_init()
144{
145   m_mfp.tadr = m_mfp.tbdr = m_mfp.tcdr = m_mfp.tddr = 0xff;
146
147   m_mfp.irqline = 6;  // MFP is connected to 68000 IRQ line 6
148   m_mfp.current_irq = -1;  // No current interrupt
149}
150
151143void x68k_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
152144{
153145   switch (id)
r26769r26770
15321524{
15331525   if(irqline == 6)  // MFP
15341526   {
1535      m_mfp.current_irq = -1;
15361527      if(m_current_vector[6] != 0x4b && m_current_vector[6] != 0x4c)
15371528         m_current_vector[6] = m_mfpdev->get_vector();
15381529      else
r26769r26770
21412132   m_crtc.reg[7] = 552;  // Vertical end
21422133   m_crtc.reg[8] = 27;   // Horizontal adjust
21432134
2144   mfp_init();
2145
21462135   m_scanline = machine().primary_screen->vpos();// = m_crtc.reg[6];  // Vertical start
21472136
21482137   // start VBlank timer
r26769r26770
22892278   // copy last half of BIOS to a user region, to use for inital startup
22902279   memcpy(user2,(rom+0xff0000),0x10000);
22912280
2292   mfp_init();
2293
22942281   m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(x68k_state::x68k_int_ack),this));
22952282
22962283   // init keyboard

Previous 199869 Revisions Next


© 1997-2024 The MAME Team