Previous 15994 Revisions Next

r4725 Sunday 17th May, 2009 at 09:42:03 UTC by Robbbert
[MBEE] Improvement to disk reading, removed unneeded includes.
[src/mess/drivers]mbee.c
[src/mess/includes]mbee.h
[src/mess/machine]mbee.c

src/mess/includes/mbee.h
r4724r4725
88#define MBEE_H_
99
1010#include "machine/wd17xx.h"
11#include "cpu/z80/z80daisy.h"
1211
1312/*----------- defined in machine/mbee.c -----------*/
1413
src/mess/machine/mbee.c
r4724r4725
99****************************************************************************/
1010
1111#include "driver.h"
12#include "machine/wd17xx.h"
1312#include "includes/mbee.h"
1413#include "cpu/z80/z80.h"
1514
1615
17static UINT8 fdc_drv = 0;
18static UINT8 fdc_head = 0;
19static UINT8 fdc_den = 0;
2016static UINT8 fdc_status = 0;
17static const device_config *mbee_fdc;
2118
2219
2320/*
r4724r4725
4037   mbee_speaker = devtag_get_device(machine, "speaker");
4138   mbee_cassette = devtag_get_device(machine, "cassette");
4239   mbee_printer = devtag_get_device(machine, "centronics");
40   mbee_fdc = devtag_get_device(machine, "wd179x");
4341}
4442
4543static WD17XX_CALLBACK( mbee_fdc_callback )
4644{
47   switch( state )
48   {
49   case WD17XX_IRQ_CLR:
50//      cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
51      fdc_status &= ~0x40;
52        break;
53   case WD17XX_IRQ_SET:
54//      cputag_set_input_line(machine, "maincpu", 0, HOLD_LINE);
55      fdc_status |= 0x40;
56        break;
57   case WD17XX_DRQ_CLR:
58      fdc_status &= ~0x80;
59      break;
60   case WD17XX_DRQ_SET:
45   if (WD17XX_IRQ_SET || WD17XX_DRQ_SET)
6146      fdc_status |= 0x80;
62        break;
63    }
47   else
48      fdc_status &= 0x7f;
6449}
6550
6651const wd17xx_interface mbee_wd17xx_interface = { mbee_fdc_callback, NULL };
6752
68 READ8_HANDLER ( mbee_fdc_status_r )
53READ8_HANDLER ( mbee_fdc_status_r )
6954{
70   logerror("mbee fdc_motor_r $%02X\n", fdc_status);
7155   return fdc_status;
7256}
7357
7458WRITE8_HANDLER ( mbee_fdc_motor_w )
7559{
76   const device_config *fdc = devtag_get_device(space->machine, "wd179x");
77   logerror("mbee fdc_motor_w $%02X\n", data);
78   /* Controller latch bits
79    * 0-1   driver select
80    * 2   head select
81    * 3   density (0: FM, 1:MFM)
82    * 4-7   unused
83    */
84   fdc_drv = data & 3;
85   fdc_head = (data >> 2) & 1;
86   fdc_den = (data >> 3) & 1;
87   wd17xx_set_drive(fdc,fdc_drv);
88   wd17xx_set_side(fdc,fdc_head);
89   if (data & (1<<3))
90   {
91      wd17xx_set_density(fdc,DEN_FM_HI);
92   }
93   else
94   {
95      wd17xx_set_density(fdc,DEN_MFM_LO);
96   }
60/*   d7..d4 not used
61   d3 density (1=MFM)
62   d2 side (1=side 1)
63   d1..d0 drive select (0 to 3 - although no microbee ever had more than 2 drives) */
9764
65   wd17xx_set_drive(mbee_fdc, data & 3);
66   wd17xx_set_side(mbee_fdc, (data & 4) ? 1 : 0);
67   wd17xx_set_density(mbee_fdc, (data & 8) ? 1 : 0);
9868}
9969
src/mess/drivers/mbee.c
r4724r4725
6868#include "sound/speaker.h"
6969#include "sound/wave.h"
7070#include "machine/z80pio.h"
71#include "machine/wd17xx.h"
7271#include "includes/mbee.h"
7372#include "devices/snapquik.h"
7473#include "devices/basicdsk.h"
r4724r4725
203202   AM_RANGE(0x0b, 0x0b) AM_MIRROR(0x10) AM_READWRITE(mbee_video_bank_r, mbee_video_bank_w)
204203   AM_RANGE(0x0c, 0x0c) AM_MIRROR(0x10) AM_READWRITE(m6545_status_r, m6545_index_w)
205204   AM_RANGE(0x0d, 0x0d) AM_MIRROR(0x10) AM_READWRITE(m6545_data_r, m6545_data_w)
206   AM_RANGE(0x44, 0x44) AM_DEVREADWRITE("wd179x", wd17xx_status_r, wd17xx_command_w)
207   AM_RANGE(0x45, 0x45) AM_DEVREADWRITE("wd179x", wd17xx_track_r, wd17xx_track_w)
208   AM_RANGE(0x46, 0x46) AM_DEVREADWRITE("wd179x", wd17xx_sector_r, wd17xx_sector_w)
209   AM_RANGE(0x47, 0x47) AM_DEVREADWRITE("wd179x", wd17xx_data_r, wd17xx_data_w)
205   AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("wd179x", wd17xx_r, wd17xx_w)
210206   AM_RANGE(0x48, 0x48) AM_READWRITE(mbee_fdc_status_r, mbee_fdc_motor_w)
211207ADDRESS_MAP_END
212208
r4724r4725
802798   return INIT_PASS;
803799}
804800
801static DEVICE_IMAGE_LOAD( mbee_floppy )
802{
803   if (device_load_basicdsk_floppy(image)==INIT_PASS)
804   {
805      if (!mame_stricmp(image_filetype(image), "ss80"))
806      {
807         basicdsk_set_geometry(image, 80, 1, 10, 512, 1, 0, FALSE);
808         return INIT_PASS;
809      }
810      else
811      if (!mame_stricmp(image_filetype(image), "ds40"))
812      {
813         basicdsk_set_geometry(image, 80, 2, 10, 512, 1, 0, FALSE);
814         return INIT_PASS;
815      }
816      else
817      if (!mame_stricmp(image_filetype(image), "ds80"))
818      {
819         basicdsk_set_geometry(image, 160, 2, 10, 512, 1, 0, FALSE);
820         return INIT_PASS;
821      }
822      else
823      if (!mame_stricmp(image_filetype(image), "ds84"))
824      {
825         basicdsk_set_geometry(image, 168, 2, 10, 512, 1, 0, FALSE);
826         return INIT_PASS;
827      }
828      else
829      if (!mame_stricmp(image_filetype(image), "dsk"))
830      {
831         return INIT_FAIL;   // not handled yet - CPC-EMU formatted image
832      }
833      else
834      if (!mame_stricmp(image_filetype(image), "img"))
835      {
836         return INIT_FAIL;   // not handled - not investigated yet
837      }
838   }
839
840   return INIT_FAIL;
841}
842
805843static void mbee_floppy_getinfo(const mess_device_class *devclass, UINT32 state, union devinfo *info)
806844{
807845   /* floppy */
808846   switch(state)
809847   {
810848      /* --- the following bits of info are returned as 64-bit signed integers --- */
811      case MESS_DEVINFO_INT_COUNT:      info->i = 4; break;
849      case MESS_DEVINFO_INT_COUNT:      info->i = 2; break;
812850
813851      /* --- the following bits of info are returned as pointers to data or functions --- */
814      case MESS_DEVINFO_PTR_LOAD:      info->load = DEVICE_IMAGE_LOAD_NAME(basicdsk_floppy); break;
852      case MESS_DEVINFO_PTR_LOAD:      info->load = DEVICE_IMAGE_LOAD_NAME(mbee_floppy); break;
815853
816854      /* --- the following bits of info are returned as NULL-terminated strings --- */
817      case MESS_DEVINFO_STR_FILE_EXTENSIONS:   strcpy(info->s = device_temp_str(), "dsk"); break;
855      case MESS_DEVINFO_STR_FILE_EXTENSIONS:   strcpy(info->s = device_temp_str(), "dsk,ss40,ds40,ds84"); break;
818856
819857      default:            legacybasicdsk_device_getinfo(devclass, state, info); break;
820858   }

Previous 15994 Revisions Next


© 1998-2018 The MESS Team