Previous 199869 Revisions Next

r17444 Friday 24th August, 2012 at 14:57:05 UTC by Miodrag Milanović
added 525hd support into floppy.c and converted ht68k to use new wd17xx core (no whatsnew)
[src/emu/imagedev]floppy.c floppy.h
[src/mess/drivers]ht68k.c

trunk/src/emu/imagedev/floppy.c
r17443r17444
1717const device_type FLOPPY_35_HD = &device_creator<floppy_35_hd>;
1818const device_type FLOPPY_35_ED = &device_creator<floppy_35_ed>;
1919const device_type FLOPPY_525_DD = &device_creator<floppy_525_dd>;
20const device_type FLOPPY_525_HD = &device_creator<floppy_525_hd>;
2021
2122floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
2223   device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock),
r17443r17444
884885   variants[var_count++] = floppy_image::SSSD;
885886   variants[var_count++] = floppy_image::SSDD;
886887}
888
889floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
890   floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock)
891{
892}
893
894floppy_525_hd::~floppy_525_hd()
895{
896}
897
898void floppy_525_hd::setup_characteristics()
899{
900   form_factor = floppy_image::FF_525;
901   tracks = 82;
902   sides = 2;
903   set_rpm(300);
904}
905
906void floppy_525_hd::handled_variants(UINT32 *variants, int &var_count) const
907{
908   var_count = 0;
909   variants[var_count++] = floppy_image::SSSD;
910   variants[var_count++] = floppy_image::SSDD;
911   variants[var_count++] = floppy_image::DSDD;
912   variants[var_count++] = floppy_image::DSHD;
913   
914}
trunk/src/emu/imagedev/floppy.h
r17443r17444
215215   virtual void setup_characteristics();
216216};
217217
218
219class floppy_525_hd : public floppy_image_device {
220public:
221   floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
222   virtual ~floppy_525_hd();
223   virtual void handled_variants(UINT32 *variants, int &var_count) const;
224   virtual void device_config_complete() { m_shortname = "floppy_525_hd"; }
225   virtual const char *image_interface() const { return "floppy_5_25"; }
226protected:
227   virtual void setup_characteristics();
228};
229
218230class floppy_connector: public device_t,
219231                  public device_slot_interface
220232{
r17443r17444
241253extern const device_type FLOPPY_35_HD;
242254extern const device_type FLOPPY_35_ED;
243255extern const device_type FLOPPY_525_DD;
256extern const device_type FLOPPY_525_HD;
244257
245258#endif /* FLOPPY_H */
trunk/src/mess/drivers/ht68k.c
r17443r17444
2626#include "emu.h"
2727#include "cpu/m68000/m68000.h"
2828#include "machine/68681.h"
29#include "formats/hxcmfm_dsk.h"
30#include "formats/mfi_dsk.h"
2931#include "imagedev/flopdrv.h"
30#include "machine/wd17xx.h"
32#include "machine/wd1772.h"
3133#include "machine/terminal.h"
3234
3335
r17443r17444
4345   ,
4446      m_p_ram(*this, "p_ram"){ }
4547
48     
49   static const floppy_format_type floppy_formats[];
50     
4651   required_device<cpu_device> m_maincpu;
4752   required_device<generic_terminal_device> m_terminal;
4853   required_device<device_t> m_duart;
49   required_device<device_t> m_fdc;
54   required_device<wd1770_t> m_fdc;
5055   DECLARE_WRITE8_MEMBER(kbd_put);
5156   DECLARE_WRITE_LINE_MEMBER(ht68k_fdc_intrq_w);
5257   required_shared_ptr<UINT16> m_p_ram;
5358};
5459
5560
61const floppy_format_type ht68k_state::floppy_formats[] = {
62   FLOPPY_MFM_FORMAT, FLOPPY_MFI_FORMAT,
63   NULL
64};
5665
66
5767static ADDRESS_MAP_START(ht68k_mem, AS_PROGRAM, 16, ht68k_state)
5868   ADDRESS_MAP_UNMAP_HIGH
5969   AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("p_ram") // 512 KB RAM / ROM at boot
6070   //AM_RANGE(0x00080000, 0x000fffff) // Expansion
6171   //AM_RANGE(0x00d80000, 0x00d8ffff) // Printer
62   AM_RANGE(0x00e00000, 0x00e00007) AM_MIRROR(0xfff8) AM_DEVREADWRITE8_LEGACY("wd1770", wd17xx_r, wd17xx_w, 0x00ff) // FDC WD1770
72   AM_RANGE(0x00e00000, 0x00e00007) AM_MIRROR(0xfff8) AM_DEVREADWRITE8("wd1770", wd177x_t, read, write, 0x00ff) // FDC WD1770
6373   AM_RANGE(0x00e80000, 0x00e800ff) AM_MIRROR(0xff00) AM_DEVREADWRITE8_LEGACY("duart68681", duart68681_r, duart68681_w, 0xff )
6474   AM_RANGE(0x00f00000, 0x00f07fff) AM_ROM AM_MIRROR(0xf8000) AM_REGION("user1",0)
6575ADDRESS_MAP_END
r17443r17444
99109{
100110   ht68k_state *state = device->machine().driver_data<ht68k_state>();
101111
102   wd17xx_set_side(state->m_fdc, BIT(data,3) ? 0 : 1);
103
104   if (BIT(data,7)==0)
105      wd17xx_set_drive(state->m_fdc,0);
106   else
107   if (BIT(data,6)==0)
108      wd17xx_set_drive(state->m_fdc,1);
109   else
110   if (BIT(data,5)==0)
111      wd17xx_set_drive(state->m_fdc,2);
112   else
113   if (BIT(data,4)==0)
114      wd17xx_set_drive(state->m_fdc,3);
112   static const char *names[] = { "fd0", "fd1", "fd2", "fd3" };
113   floppy_image_device *floppy = 0;
114   for(int i=0; i<4; i++) {
115      if(BIT(data, 7-i)==0) {
116         floppy_connector *con = device->machine().device<floppy_connector>(names[i]);
117         if(con)
118            floppy = con->get_device();
119         break;
120      }     
121   }
122   if (floppy) floppy->ss_w(BIT(data,3) ? 0 : 1);
123   state->m_fdc->set_floppy(floppy);     
115124}
116125
117126WRITE8_MEMBER( ht68k_state::kbd_put )
r17443r17444
132141   duart_output
133142};
134143
135WRITE_LINE_MEMBER( ht68k_state::ht68k_fdc_intrq_w )
136{
137   //cputag_set_input_line_and_vector(machine(), "maincpu", M68K_IRQ_4, HOLD_LINE, M68K_INT_ACK_AUTOVECTOR);
138}
144static SLOT_INTERFACE_START( ht68k_floppies )
145   SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
146SLOT_INTERFACE_END
139147
140static const wd17xx_interface ht68k_wd17xx_interface =
141{
142   DEVCB_NULL,
143   DEVCB_DRIVER_LINE_MEMBER(ht68k_state, ht68k_fdc_intrq_w),
144   DEVCB_NULL,
145   {FLOPPY_0, FLOPPY_1, FLOPPY_2, FLOPPY_3}
146};
147148
148static const floppy_interface ht68k_floppy_interface =
149{
150   DEVCB_NULL,
151   DEVCB_NULL,
152   DEVCB_NULL,
153   DEVCB_NULL,
154   DEVCB_NULL,
155   FLOPPY_STANDARD_5_25_DSHD,
156   LEGACY_FLOPPY_OPTIONS_NAME(default),
157   NULL,
158   NULL
159};
160
161149static MACHINE_CONFIG_START( ht68k, ht68k_state )
162150   /* basic machine hardware */
163151   MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
r17443r17444
169157   MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf)
170158
171159   MCFG_DUART68681_ADD( "duart68681", XTAL_8MHz / 2, ht68k_duart68681_config )
172   MCFG_WD1770_ADD("wd1770", ht68k_wd17xx_interface )
173   MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ht68k_floppy_interface)
160
161   MCFG_WD1770x_ADD("wd1770", XTAL_8MHz )
162
163   MCFG_FLOPPY_DRIVE_ADD("fd0", ht68k_floppies, "525hd", 0, ht68k_state::floppy_formats)
164   MCFG_FLOPPY_DRIVE_ADD("fd1", ht68k_floppies, "525hd", 0, ht68k_state::floppy_formats)
165   MCFG_FLOPPY_DRIVE_ADD("fd2", ht68k_floppies, "525hd", 0, ht68k_state::floppy_formats)
166   MCFG_FLOPPY_DRIVE_ADD("fd3", ht68k_floppies, "525hd", 0, ht68k_state::floppy_formats)   
174167MACHINE_CONFIG_END
175168
176169/* ROM definition */

Previous 199869 Revisions Next

© 1997-2024 The MAME Team