Previous 15994 Revisions Next

r6181 Saturday 24th October, 2009 at 21:26:10 UTC by Nathan Woods
Cleanups [Atari Ace]
[docs]messnew.txt
[src/mess/devices]ti99cart.c
[src/mess/drivers]v1050.c
[src/mess/includes]fm7.h gba.h super80.h ti85.h
[src/mess/machine]amigakbd.c gdrom.c llc.c pc_hdc.c serial.c thomson.c ti85.c vectrex.c
[src/mess/osd/winui]layoutms.c
[src/mess/video]pc1403.c vc4000.c
[src/osd/winui]dialogs.c directories.h layout.c mui_opts.c properties.c treeview.c treeview.h winui.c

src/osd/winui/treeview.h
r6180r6181
5858   BOOL        m_bExpectedResult;                       // Expected query result
5959} FOLDERDATA, *LPFOLDERDATA;
6060
61typedef const FOLDERDATA *LPCFOLDERDATA;
62
6163typedef struct
6264{
6365   DWORD m_dwFilterType;            /* Filter value */
r6180r6181
6668   BOOL m_bExpectedResult;            /* Expected query result */
6769} FILTER_ITEM, *LPFILTER_ITEM;
6870
71typedef const FILTER_ITEM *LPCFILTER_ITEM;
72
6973/***************************************************************************
7074    Functions to build builtin folder lists
7175 ***************************************************************************/
r6180r6181
171175
172176void FreeFolders(void);
173177void ResetFilters(void);
174void InitTree(LPFOLDERDATA lpFolderData, LPFILTER_ITEM lpFilterList);
178void InitTree(LPCFOLDERDATA lpFolderData, LPCFILTER_ITEM lpFilterList);
175179void SetCurrentFolder(LPTREEFOLDER lpFolder);
176180UINT GetCurrentFolderID(void);
177181
r6180r6181
187191
188192void ResetWhichGamesInFolders(void);
189193
190LPFOLDERDATA FindFilter(DWORD folderID);
194LPCFOLDERDATA FindFilter(DWORD folderID);
191195
192196BOOL GameFiltered(int nGame, DWORD dwFlags);
193197BOOL GetParentFound(int nGame);
194198
195LPFILTER_ITEM GetFilterList(void);
199LPCFILTER_ITEM GetFilterList(void);
196200
197201void SetTreeIconSize(HWND hWnd, BOOL bLarge);
198202BOOL GetTreeIconSize(void);
src/osd/winui/directories.h
r6180r6181
3939DIRECTORYINFO;
4040
4141/* in layout[ms].c */
42extern DIRECTORYINFO g_directoryInfo[];
42extern const DIRECTORYINFO g_directoryInfo[];
4343
4444INT_PTR CALLBACK DirectoriesDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
4545
src/osd/winui/mui_opts.c
r6180r6181
871871static void GetsShowFolderFlags(LPBITS bits)
872872{
873873   char s[2000];
874   extern FOLDERDATA g_folderData[];
874   extern const FOLDERDATA g_folderData[];
875875   char *token;
876876
877877   snprintf(s, ARRAY_LENGTH(s), "%s", options_get_string(settings, MUIOPTION_HIDE_FOLDERS));
r6180r6181
911911   int i;
912912   int num_saved = 0;
913913   char str[10000];
914   extern FOLDERDATA g_folderData[];
914   extern const FOLDERDATA g_folderData[];
915915
916916   GetsShowFolderFlags(show_folder_flags);
917917
r6180r6181
23252325const char * GetFolderNameByID(UINT nID)
23262326{
23272327   UINT i;
2328   extern FOLDERDATA g_folderData[];
2328   extern const FOLDERDATA g_folderData[];
23292329   extern LPEXFOLDERDATA ExtraFolderData[];
23302330
23312331   for (i = 0; i < MAX_EXTRA_FOLDERS * MAX_EXTRA_SUBFOLDERS; i++)
src/osd/winui/layout.c
r6180r6181
4646
4747static BOOL FilterAvailable(int driver_index);
4848
49FOLDERDATA g_folderData[] =
49const FOLDERDATA g_folderData[] =
5050{
5151   {"All Games",       "allgames",          FOLDER_ALLGAMES,     IDI_FOLDER,            0,             0,            NULL,                       NULL,                    TRUE },
5252   {"Available",       "available",         FOLDER_AVAILABLE,    IDI_FOLDER_AVAILABLE,     F_AVAILABLE,   0,            NULL,                       FilterAvailable,         TRUE },
r6180r6181
8080};
8181
8282/* list of filter/control Id pairs */
83FILTER_ITEM g_filterList[] =
83const FILTER_ITEM g_filterList[] =
8484{
8585   { F_CLONES,       IDC_FILTER_CLONES,      DriverIsClone, TRUE },
8686   { F_NONWORKING,   IDC_FILTER_NONWORKING,  DriverIsBroken, TRUE },
r6180r6181
9595   { 0 }
9696};
9797
98DIRECTORYINFO g_directoryInfo[] =
98const DIRECTORYINFO g_directoryInfo[] =
9999{
100100   { "ROMs",                  GetRomDirs,      SetRomDirs,      TRUE,  DIRDLG_ROMS },
101101   { "Samples",               GetSampleDirs,   SetSampleDirs,   TRUE,  DIRDLG_SAMPLES },
src/osd/winui/dialogs.c
r6180r6181
7171   IDC_FILTER_HORIZONTAL,  IDC_FILTER_VERTICAL
7272};
7373
74static void DisableFilterControls(HWND hWnd, LPFOLDERDATA lpFilterRecord,
75                          LPFILTER_ITEM lpFilterItem, DWORD dwFlags);
74static void DisableFilterControls(HWND hWnd, LPCFOLDERDATA lpFilterRecord,
75                          LPCFILTER_ITEM lpFilterItem, DWORD dwFlags);
7676static void EnableFilterExclusions(HWND hWnd, DWORD dwCtrlID);
77static DWORD ValidateFilters(LPFOLDERDATA lpFilterRecord, DWORD dwFlags);
77static DWORD ValidateFilters(LPCFOLDERDATA lpFilterRecord, DWORD dwFlags);
7878static void OnHScroll(HWND hWnd, HWND hwndCtl, UINT code, int pos);
7979
8080/***************************************************************************/
r6180r6181
401401{
402402   static DWORD         dwFilters;
403403   static DWORD         dwpFilters;
404   static LPFOLDERDATA      lpFilterRecord;
404   static LPCFOLDERDATA   lpFilterRecord;
405405   char                strText[250];
406406   int                i;
407407
r6180r6181
411411   {
412412      LPTREEFOLDER folder = GetCurrentFolder();
413413      LPTREEFOLDER lpParent = NULL;
414      LPFILTER_ITEM g_lpFilterList = GetFilterList();
414      LPCFILTER_ITEM g_lpFilterList = GetFilterList();
415415
416416      dwFilters = 0;
417417
r6180r6181
558558      WORD wID       = GET_WM_COMMAND_ID(wParam, lParam);
559559      WORD wNotifyCode = GET_WM_COMMAND_CMD(wParam, lParam);
560560      LPTREEFOLDER folder = GetCurrentFolder();
561      LPFILTER_ITEM g_lpFilterList = GetFilterList();
561      LPCFILTER_ITEM g_lpFilterList = GetFilterList();
562562
563563      switch (wID)
564564      {
r6180r6181
783783    private functions
784784 ***************************************************************************/
785785
786static void DisableFilterControls(HWND hWnd, LPFOLDERDATA lpFilterRecord,
787                          LPFILTER_ITEM lpFilterItem, DWORD dwFlags)
786static void DisableFilterControls(HWND hWnd, LPCFOLDERDATA lpFilterRecord,
787                          LPCFILTER_ITEM lpFilterItem, DWORD dwFlags)
788788{
789789   HWND  hWndCtrl = GetDlgItem(hWnd, lpFilterItem->m_dwCtrlID);
790790   DWORD dwFilterType = lpFilterItem->m_dwFilterType;
r6180r6181
844844}
845845
846846// Validate filter setting, mask out inappropriate filters for this folder
847static DWORD ValidateFilters(LPFOLDERDATA lpFilterRecord, DWORD dwFlags)
847static DWORD ValidateFilters(LPCFOLDERDATA lpFilterRecord, DWORD dwFlags)
848848{
849849   DWORD dwFilters;
850850
src/osd/winui/treeview.c
r6180r6181
116116static char         *ExtraFolderIcons[MAX_EXTRA_FOLDERS];
117117
118118// built in folders and filters
119static LPFOLDERDATA  g_lpFolderData;
120static LPFILTER_ITEM g_lpFilterList;   
119static LPCFOLDERDATA  g_lpFolderData;
120static LPCFILTER_ITEM g_lpFilterList;
121121
122122/***************************************************************************
123123    private function prototypes
r6180r6181
214214   }
215215}
216216
217void InitTree(LPFOLDERDATA lpFolderData, LPFILTER_ITEM lpFilterList)
217void InitTree(LPCFOLDERDATA lpFolderData, LPCFILTER_ITEM lpFilterList)
218218{
219219   LONG_PTR l;
220220   
r6180r6181
428428   return FALSE;
429429}
430430
431LPFILTER_ITEM GetFilterList(void)
431LPCFILTER_ITEM GetFilterList(void)
432432{
433433   return g_lpFilterList;
434434}
r6180r6181
12851285   for (i = 0; i < num_top_level_folders; i++)
12861286   {
12871287      LPTREEFOLDER lpFolder = treeFolders[i];
1288      LPFOLDERDATA lpFolderData = NULL;
1288      LPCFOLDERDATA lpFolderData = NULL;
12891289
12901290      for (j = 0; g_lpFolderData[j].m_lpTitle; j++)
12911291      {
r6180r6181
15541554{
15551555   int          i = 0;
15561556   DWORD         dwFolderFlags;
1557   LPFOLDERDATA   fData = 0;
1557   LPCFOLDERDATA   fData = 0;
15581558
15591559   if (treeFolders != NULL)
15601560   {
r6180r6181
18271827   {
18281828      switch (uMsg)
18291829      {   
1830       case WM_MOUSEMOVE:
1830      case WM_MOUSEMOVE:
18311831      {
18321832         if (MouseHasBeenMoved())
18331833            ShowCursor(TRUE);
r6180r6181
18661866 */
18671867
18681868/* find a FOLDERDATA by folderID */
1869LPFOLDERDATA FindFilter(DWORD folderID)
1869LPCFOLDERDATA FindFilter(DWORD folderID)
18701870{
18711871   int i;
18721872
src/osd/winui/winui.c
r6180r6181
712712static HIMAGELIST   hHeaderImages = NULL;
713713static int          *icon_index = NULL; /* for custom per-game icons */
714714
715static TBBUTTON tbb[] =
715static const TBBUTTON tbb[] =
716716{
717717   {0, ID_VIEW_FOLDERS,    TBSTATE_ENABLED, TBSTYLE_CHECK,      {0, 0}, 0, 0},
718718   {1, ID_VIEW_PICTURE_AREA,TBSTATE_ENABLED, TBSTYLE_CHECK,      {0, 0}, 0, 1},
r6180r6181
16971697   WNDCLASS   wndclass;
16981698   RECT      rect;
16991699   int i, nSplitterCount;
1700   extern FOLDERDATA g_folderData[];
1701   extern FILTER_ITEM g_filterList[];
1700   extern const FOLDERDATA g_folderData[];
1701   extern const FILTER_ITEM g_filterList[];
17021702   extern const char *history_filename;
17031703   extern const char *mameinfo_filename;
17041704   LONG common_control_version = GetCommonControlVersion();
r6180r6181
18031803   {
18041804      struct TabViewOptions opts;
18051805
1806      static struct TabViewCallbacks s_tabviewCallbacks =
1806      static const struct TabViewCallbacks s_tabviewCallbacks =
18071807      {
18081808         GetShowTabCtrl,         // pfnGetShowTabCtrl
18091809         SetCurrentTab,         // pfnSetCurrentTab
r6180r6181
45114511   case ID_OPTIONS_BG:
45124512      {
45134513         OPENFILENAME OpenFileName;
4514         static TCHAR szFile[MAX_PATH] = TEXT("\0");
4514         TCHAR szFile[MAX_PATH];
45154515         TCHAR*       t_bgdir = tstring_from_utf8(GetBgDir());
45164516         if( !t_bgdir )
45174517            return FALSE;
45184518
4519         szFile[0] = 0;
45194520         OpenFileName.lStructSize       = sizeof(OPENFILENAME);
45204521         OpenFileName.hwndOwner         = hMain;
45214522         OpenFileName.hInstance         = 0;
r6180r6181
63396340   MENUITEMINFO mii;
63406341   HMENU hMenu;
63416342   int i;
6342   extern FOLDERDATA g_folderData[];
6343   extern const FOLDERDATA g_folderData[];
63436344
63446345   ZeroMemory(&mii,sizeof(mii));
63456346   mii.cbSize = sizeof(mii);
src/osd/winui/properties.c
r6180r6181
618618/* Build CPU info string */
619619static char *GameInfoCPU(UINT nIndex)
620620{
621   static char buf[1024] = "";
621   static char buf[1024];
622622   machine_config *config = machine_config_alloc(drivers[nIndex]->machine_config);
623623   const device_config *cpu;
624624
src/mess/devices/ti99cart.c
r6180r6181
16071607   }
16081608}
16091609
1610DEVICE_GET_INFO(ti99_cartridge_pcb_std)
1610static DEVICE_GET_INFO(ti99_cartridge_pcb_std)
16111611{
16121612   DEVICE_GET_INFO_CALL(ti99_cart_common);
16131613}
r6180r6181
16491649   }
16501650}
16511651
1652DEVICE_GET_INFO(ti99_cartridge_pcb_minimem)
1652static DEVICE_GET_INFO(ti99_cartridge_pcb_minimem)
16531653{
16541654   switch(state)
16551655   {
r6180r6181
17231723   }
17241724}
17251725
1726DEVICE_GET_INFO(ti99_cartridge_pcb_mbx)
1726static DEVICE_GET_INFO(ti99_cartridge_pcb_mbx)
17271727{
17281728   switch(state)
17291729   {
src/mess/video/pc1403.c
r6180r6181
3737   UINT8 reg[0x100];
3838} pc1403_lcd;
3939
40static const struct { int x, y; } pos[]={
41    { 152,67 }, // pc1403
42    { 155,69 } // pc1403h
43};
40static int DOWN, RIGHT;
4441
45static int DOWN=67, RIGHT=152;
46
4742VIDEO_START( pc1403 )
4843{
4944   if (strcmp(machine->gamedrv->name, "pc1403h") == 0)
5045   {
51      DOWN = pos[1].y;
52      RIGHT = pos[1].x;
46      DOWN = 69;
47      RIGHT = 155;
5348   }
49   else
50   {
51      DOWN = 67;
52      RIGHT = 152;
53   }
5454
5555    VIDEO_START_CALL(pocketc);
5656}
src/mess/video/vc4000.c
r6180r6181
1616  not "rasterline" based
1717 */
1818
19static UINT8 sprite_collision[0x20];
20static UINT8 background_collision[0x20];
19#define STICKCENTRE   (105)
20#define STICKLOW   (20)
21#define STICKHIGH   (225)
2122
2223#define VC4000_END_LINE (269)
2324
r6180r6181
6869   } reg;
6970
7071   bitmap_t *bitmap;
71} vc4000_video =
72{
73   {
74      { &vc4000_video.reg.d.sprites[0],1 },
75      { &vc4000_video.reg.d.sprites[1],2 },
76      { &vc4000_video.reg.d.sprites[2],4 },
77      { &vc4000_video.reg.d.sprite4,8 }
78   }
79};
72} vc4000_video;
8073
74static UINT8 sprite_collision[0x20];
75static UINT8 background_collision[0x20];
76static UINT8 joy1_x,joy1_y,joy2_x,joy2_y;
77
8178VIDEO_START(vc4000)
8279{
8380   const device_config *screen = video_screen_first(machine->config);
r6180r6181
10198      if ((i&0x18)==0x18) background_collision[i]|=0x10;
10299   }
103100
101   joy1_x = STICKCENTRE;
102   joy1_y = STICKCENTRE;
103   joy2_x = STICKCENTRE;
104   joy2_y = STICKCENTRE;
105
106   memset(&vc4000_video, 0, sizeof(vc4000_video));
107   for (i=0; i<3; i++)
108   {
109      vc4000_video.sprites[i].data = &vc4000_video.reg.d.sprites[i];
110      vc4000_video.sprites[i].mask = 1 << i;
111   }
112   vc4000_video.sprites[3].data = &vc4000_video.reg.d.sprite4;
113   vc4000_video.sprites[3].mask = 1 << 3;
114
104115   vc4000_video.bitmap = auto_bitmap_alloc(machine, width, height, BITMAP_FORMAT_INDEXED16);
105116}
106117
107#define STICKCENTRE   (105)
108#define STICKLOW   (20)
109#define STICKHIGH   (225)
110
111118INLINE UINT8 vc4000_joystick_return_to_centre(UINT8 joy)
112119{
113120   UINT8 data;
r6180r6181
126133READ8_HANDLER(vc4000_video_r)
127134{
128135   UINT8 data=0;
129   static UINT8 joy1_x=STICKCENTRE,joy1_y=STICKCENTRE,joy2_x=STICKCENTRE,joy2_y=STICKCENTRE;
130136   if (offset > 0xcf) offset &= 0xcf;   // c0-cf is mirrored at d0-df, e0-ef, f0-ff
131137   switch (offset) {
132138
src/mess/includes/gba.h
r6180r6181
209209   UINT8 fifo_a[20], fifo_b[20];
210210} gba_state;
211211
212// defined in video/gba.c
212/*----------- defined in video/gba.c -----------*/
213
213214void gba_draw_scanline(running_machine *machine, int y);
214215void gba_video_start(running_machine *machine);
215216
src/mess/includes/fm7.h
r6180r6181
5454   UINT8 vsync_flag;
5555};
5656
57/*----------- defined in drivers/fm7.c -----------*/
58
59READ8_HANDLER( fm7_sub_keyboard_r );
60READ8_HANDLER( fm77av_key_encoder_r );
61WRITE8_HANDLER( fm77av_key_encoder_w );
62READ8_HANDLER( fm7_sub_beeper_r );
63
64
65/*----------- defined in video/fm7.c -----------*/
66
5767void fm7_mmr_refresh(const address_space*);
5868
5969TIMER_CALLBACK( fm77av_vsync );
r6180r6181
6575READ8_HANDLER( fm77av_sub_modestatus_r );
6676WRITE8_HANDLER( fm77av_sub_modestatus_w );
6777WRITE8_HANDLER( fm77av_sub_bank_w );
68READ8_HANDLER( fm7_sub_beeper_r );
6978
7079READ8_HANDLER( fm7_cancel_ack );
7180READ8_HANDLER( fm7_attn_irq_r );
r6180r6181
8796READ8_HANDLER( fm7_palette_r );
8897WRITE8_HANDLER( fm7_palette_w );
8998
90READ8_HANDLER( fm7_sub_keyboard_r );
91READ8_HANDLER( fm77av_key_encoder_r );
92WRITE8_HANDLER( fm77av_key_encoder_w );
93
9499READ8_HANDLER( fm7_vram0_r );
95100READ8_HANDLER( fm7_vram1_r );
96101READ8_HANDLER( fm7_vram2_r );
src/mess/includes/super80.h
r6180r6181
11#include "video/mc6845.h"
22#include "machine/z80pio.h"
33
4/*----- super80 ----------*/
4/*----------- defined in video/super80.c -----------*/
55
6
76PALETTE_INIT( super80m );
87VIDEO_UPDATE( super80 );
98VIDEO_UPDATE( super80d );
r6180r6181
1211VIDEO_START( super80 );
1312VIDEO_EOF( super80m );
1413
15/*----- Super80V ---------*/
16
1714READ8_HANDLER( super80v_low_r );
1815READ8_HANDLER( super80v_high_r );
1916WRITE8_HANDLER( super80v_low_w );
r6180r6181
2724
2825extern UINT8 *pcgram;
2926
30/*------- machine -------*/
27/*----------- defined in machine/super80.c -----------*/
3128
3229READ8_HANDLER( super80_dc_r );
3330READ8_HANDLER( super80_f2_r );
src/mess/includes/ti85.h
r6180r6181
2020
2121MACHINE_START( ti81 );
2222MACHINE_START( ti82 );
23MACHINE_START( ti83 );
2423MACHINE_START( ti85 );
2524MACHINE_START( ti83p );
2625MACHINE_START( ti86 );
src/mess/osd/winui/layoutms.c
r6180r6181
3535
3636static BOOL FilterAvailable(int driver_index);
3737
38FOLDERDATA g_folderData[] =
38const FOLDERDATA g_folderData[] =
3939{
4040   {"All Systems",     "allgames",          FOLDER_ALLGAMES,     IDI_FOLDER,            0,             0,            NULL,                       NULL,              TRUE },
4141   {"Available",       "available",         FOLDER_AVAILABLE,    IDI_FOLDER_AVAILABLE,     F_AVAILABLE,   0,            NULL,                       FilterAvailable,              TRUE },
r6180r6181
6565};
6666
6767/* list of filter/control Id pairs */
68FILTER_ITEM g_filterList[] =
68const FILTER_ITEM g_filterList[] =
6969{
7070   { F_COMPUTER,     IDC_FILTER_COMPUTER,    DriverIsComputer, TRUE },
7171   { F_CONSOLE,      IDC_FILTER_CONSOLE,     DriverIsComputer, FALSE },
r6180r6181
8181   { 0 }
8282};
8383
84DIRECTORYINFO g_directoryInfo[] =
84const DIRECTORYINFO g_directoryInfo[] =
8585{
8686   { "ROMs",                  GetRomDirs,      SetRomDirs,      TRUE,  DIRDLG_ROMS },
8787   { "Software",              GetSoftwareDirs, SetSoftwareDirs, TRUE,  DIRDLG_SOFTWARE },
src/mess/machine/gdrom.c
r6180r6181
2727    cdrom_file *cdrom;
2828} SCSIGd;
2929
30static UINT8 GDROM_Cmd11_Reply[32] =
30static const UINT8 GDROM_Cmd11_Reply[32] =
3131{
3232   0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x19, 0x00, 0x00, 0x08, 0x53, 0x45, 0x20, 0x20, 0x20, 0x20,
3333   0x20, 0x20, 0x52, 0x65, 0x76, 0x20, 0x36, 0x2E, 0x34, 0x32, 0x39, 0x39, 0x30, 0x33, 0x31, 0x36
src/mess/machine/serial.c
r6180r6181
427427   serial_connection_out(machine, connection);
428428}
429429
430void serial_protocol_none_sent_char(int id)
430static void serial_protocol_none_sent_char(int id)
431431{
432432   int i;
433433   int bit;
src/mess/machine/thomson.c
r6180r6181
3737/* It must be set accordingly in formats/thom_cas.c */
3838#define K7_SPEED_HACK 0
3939
40/* bank logging */
41static int old_cart_bank;
42static int old_ram_bank;
43static int old_floppy_bank;
44
45
46
4047/********************* common cassette code ***************************/
4148
4249INLINE const device_config* thom_cassette_img( running_machine *machine )
r6180r6181
506513static void to7_update_cart_bank(running_machine *machine)
507514{
508515   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
509   static int old_bank = -1;
510516   int bank = 0;
511517   if ( thom_cart_nb_banks )
512518   {
r6180r6181
514520      memory_install_read8_handler(space, 0x0000, 0x0003, 0, 0, to7_cartridge_r );
515521   }
516522
517   if ( bank != old_bank )
523   if ( bank != old_cart_bank )
518524      LOG_BANK(( "to7_update_cart_bank: CART is cartridge bank %i\n", bank ));
519525
520526   memory_set_bank( machine, THOM_CART_BANK, bank );
521   old_bank = bank;
527   old_cart_bank = bank;
522528}
523529
524530
r6180r6181
15181524   pia6821_cb1_w( sys_pia, 0, 0 );
15191525
15201526   /* memory */
1527   old_cart_bank = -1;
15211528   to7_update_cart_bank(machine);
15221529   /* thom_cart_bank not reset */
15231530
r6180r6181
16101617   const device_config *sys_pia = devtag_get_device( machine, THOM_PIA_SYS );
16111618   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
16121619   UINT8 portb = pia6821_get_port_b_z_mask( sys_pia );
1613   static int old_bank = -1;
16141620   int bank;
16151621
16161622   switch (portb & 0xf8)
r6180r6181
16331639      return;
16341640   }
16351641
1636   if ( bank != old_bank )
1642   if ( bank != old_ram_bank )
16371643      LOG_BANK(( "to770_update_ram_bank: RAM bank change %i\n", bank ));
16381644
16391645   if ( messram_get_size(devtag_get_device(machine, "messram")) == 128*1024 || bank < 2 )
r6180r6181
16461652      memory_install_write8_handler(space, 0xa000, 0xdfff, 0, 0, SMH_UNMAP );
16471653   }
16481654
1649   old_bank = bank;
1655   old_ram_bank = bank;
16501656}
16511657
16521658
r6180r6181
17721778   pia6821_cb1_w( sys_pia, 0, 0 );
17731779
17741780   /* memory */
1781   old_ram_bank = -1;
1782   old_cart_bank = -1;
17751783   to7_update_cart_bank(machine);
17761784   to770_update_ram_bank(machine);
17771785   /* thom_cart_bank not reset */
r6180r6181
20302038static void mo5_update_cart_bank(running_machine *machine)
20312039{
20322040   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
2033   static int old_bank = -1;
20342041   int rom_is_ram = mo5_reg_cart & 4;
20352042   int bank = 0;
20362043
r6180r6181
20412048      /* 64 KB ROM from "JANE" cartridge */
20422049      memory_install_write8_handler( space, 0xb000, 0xefff, 0, 0, SMH_NOP );
20432050      bank = mo5_reg_cart & 3;
2044      if ( bank != old_bank )
2051      if ( bank != old_cart_bank )
20452052         LOG_BANK(( "mo5_update_cart_bank: CART is cartridge bank %i (A7CB style)\n", bank ));
20462053   }
20472054   else if ( rom_is_ram )
r6180r6181
20502057      int write_enable = mo5_reg_cart & 8;
20512058      bank = 4 + ( mo5_reg_cart & 3 );
20522059      memory_install_write8_handler( space, 0xb000, 0xefff, 0, 0, write_enable ? (write8_space_func)(STATIC_BANK1 + THOM_CART_BANK - 1) :  SMH_NOP );
2053      if ( bank != old_bank )
2060      if ( bank != old_cart_bank )
20542061         LOG_BANK(( "mo5_update_cart_bank: CART is nanonetwork RAM bank %i (write-enable=%i)\n", mo5_reg_cart & 3, write_enable ? 1 : 0 ));
20552062   }
20562063   else
r6180r6181
20622069         bank = thom_cart_bank % thom_cart_nb_banks;
20632070         memory_install_read8_handler( space, 0xbffc, 0xbfff, 0, 0, mo5_cartridge_r );
20642071      }
2065      if ( bank != old_bank )
2072      if ( bank != old_cart_bank )
20662073         LOG_BANK(( "mo5_update_cart_bank: CART is internal / cartridge bank %i\n", thom_cart_bank ));
20672074   }
20682075   memory_set_bank( machine, THOM_CART_BANK, bank );
2069   old_bank = bank;
2076   old_cart_bank = bank;
20702077}
20712078
20722079
r6180r6181
21392146   pia6821_ca1_w( sys_pia, 0, 0 );
21402147
21412148   /* memory */
2149   old_cart_bank = -1;
21422150   mo5_update_cart_bank(machine);
21432151   /* mo5_reg_cart not reset */
21442152   /* thom_cart_bank not reset */
r6180r6181
23912399static void to9_update_cart_bank(running_machine *machine)
23922400{
23932401   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
2394   static int old_bank = -1;
23952402   int bank = 0;
23962403   int slot = ( mc6846_get_output_port(devtag_get_device(machine, "mc6846")) >> 4 ) & 3; /* bits 4-5: ROM bank */
23972404
r6180r6181
24032410   case 0:
24042411      /* BASIC (64 KB) */
24052412      bank = 4 + to9_soft_bank;
2406      if ( bank != old_bank )
2413      if ( bank != old_cart_bank )
24072414         LOG_BANK(( "to9_update_cart_bank: CART is BASIC bank %i\n", to9_soft_bank ));
24082415      break;
24092416   case 1:
24102417      /* software 1 (32 KB) */
24112418      bank = 8 + (to9_soft_bank & 1);
2412      if ( bank != old_bank )
2419      if ( bank != old_cart_bank )
24132420         LOG_BANK(( "to9_update_cart_bank: CART is software 1 bank %i\n", to9_soft_bank ));
24142421      break;
24152422   case 2:
24162423      /* software 2 (32 KB) */
24172424      bank = 10 + (to9_soft_bank & 1);
2418      if ( bank != old_bank )
2425      if ( bank != old_cart_bank )
24192426         LOG_BANK(( "to9_update_cart_bank: CART is software 2 bank %i\n", to9_soft_bank ));
24202427      break;
24212428   case 3:
r6180r6181
24252432         bank = thom_cart_bank % thom_cart_nb_banks;
24262433         memory_install_read8_handler( space, 0x0000, 0x0003, 0, 0, to7_cartridge_r );
24272434      }
2428      if ( bank != old_bank )
2435      if ( bank != old_cart_bank )
24292436         LOG_BANK(( "to9_update_cart_bank: CART is cartridge bank %i\n",  thom_cart_bank ));
24302437      break;
24312438   }
24322439
24332440   memory_set_bank( machine, THOM_CART_BANK, bank );
2434   old_bank = bank;
2441   old_cart_bank = bank;
24352442}
24362443
24372444
r6180r6181
24762483{
24772484   const device_config *sys_pia = devtag_get_device( machine, THOM_PIA_SYS );
24782485   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
2479   static int old_bank = -1;
24802486   UINT8 port = mc6846_get_output_port(devtag_get_device(machine, "mc6846"));
24812487   UINT8 portb = pia6821_get_port_b_z_mask( sys_pia );
24822488   UINT8 disk = ((port >> 2) & 1) | ((port >> 5) & 2); /* bits 6,2: RAM bank */
r6180r6181
25032509      return;
25042510   }
25052511
2506   if ( old_bank != bank )
2512   if ( old_ram_bank != bank )
25072513      LOG_BANK(( "to9_update_ram_bank: bank %i selected (pia=$%02X disk=%i)\n", bank, portb & 0xf8, disk ));
25082514
25092515   if ( messram_get_size(devtag_get_device(machine, "messram")) == 192*1024 || bank < 6 )
r6180r6181
25162522      memory_install_write8_handler( space, 0xa000, 0xdfff, 0, 0, SMH_NOP );
25172523   }
25182524
2519   old_bank = bank;
2525   old_ram_bank = bank;
25202526}
25212527
25222528
r6180r6181
30983104   pia6821_cb1_w( sys_pia, 0, 0 );
30993105
31003106   /* memory */
3107   old_ram_bank = -1;
3108   old_cart_bank = -1;
31013109   to9_soft_bank = 0;
31023110   to9_update_cart_bank(machine);
31033111   to9_update_ram_bank(machine);
r6180r6181
35023510
35033511static void to8_update_floppy_bank( running_machine *machine )
35043512{
3505   static int old_bank = -1;
35063513   int bank = (to8_reg_sys1 & 0x80) ? to7_floppy_bank : (to8_bios_bank + TO7_NB_FLOP_BANK);
35073514
3508   if ( bank != old_bank )
3515   if ( bank != old_floppy_bank )
35093516      LOG_BANK(( "to8_update_floppy_bank: floppy ROM is %s bank %i\n",
35103517           (to8_reg_sys1 & 0x80) ? "external" : "internal",
35113518           bank % TO7_NB_FLOP_BANK ));
35123519   memory_set_bank( machine, THOM_FLOP_BANK, bank );
3513   old_bank = bank;
3520   old_floppy_bank = bank;
35143521}
35153522
35163523
r6180r6181
35903597static void to8_update_cart_bank (running_machine *machine)
35913598{
35923599   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
3593   static int old_bank = -1;
35943600   int bank = 0;
35953601
35963602   /* reset bank switch */
r6180r6181
36063612                      (to8_cart_vpage <= 4) ? to8_vcart_w :
36073613                      (write8_space_func)(STATIC_BANK1 + THOM_CART_BANK - 1) :
36083614                      SMH_NOP );
3609      if ( bank != old_bank )
3615      if ( bank != old_cart_bank )
36103616         LOG_BANK(( "to8_update_cart_bank: CART is RAM bank %i (write-enable=%i)\n", to8_cart_vpage, (to8_reg_cart & 0x40) ? 1 : 0 ));
36113617   }
36123618   else
r6180r6181
36163622      {
36173623         /* internal software ROM space */
36183624         bank = 4 + to8_soft_bank;
3619         if ( bank != old_bank )
3625         if ( bank != old_cart_bank )
36203626            LOG_BANK(( "to8_update_cart_bank: CART is internal bank %i\n",
36213627                 to8_soft_bank ));
36223628      }
r6180r6181
36303636
36313637         }
36323638
3633         if ( bank != old_bank )
3639         if ( bank != old_cart_bank )
36343640            LOG_BANK(( "to8_update_cart_bank: CART is external cartridge bank %i\n", thom_cart_bank ));
36353641      }
36363642   }
r6180r6181
36403646      memory_set_bank( machine, THOM_CART_BANK, bank );
36413647   }
36423648
3643   old_bank = bank;
3649   old_cart_bank = bank;
36443650}
36453651
36463652
r6180r6181
40744080   pia6821_cb1_w( sys_pia, 0, 0 );
40754081
40764082   /* memory */
4083   old_ram_bank = -1;
4084   old_cart_bank = -1;
4085   old_floppy_bank = -1;
40774086   to8_cart_vpage = 0;
40784087   to8_data_vpage = 0;
40794088   to8_soft_bank = 0;
r6180r6181
42414250   pia6821_cb1_w( sys_pia, 0, 0 );
42424251
42434252   /* memory */
4253   old_ram_bank = -1;
4254   old_cart_bank = -1;
4255   old_floppy_bank = -1;
42444256   to8_cart_vpage = 0;
42454257   to8_data_vpage = 0;
42464258   to8_soft_bank = 0;
r6180r6181
43484360   const device_config *sys_pia = devtag_get_device( machine, THOM_PIA_SYS );
43494361   const address_space* space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
43504362   int b = (pia6821_get_output_a( sys_pia ) >> 5) & 1;
4351   static int old_bank = -1;
43524363   int bank = 0;
43534364
43544365   memory_install_read8_handler( space, 0xb000, 0xefff, 0, 0, (read8_space_func)(STATIC_BANK1 + THOM_CART_BANK - 1) );
r6180r6181
43644375         memory_install_write8_handler( space, 0xb000, 0xefff, 0, 0,
43654376                         (to8_reg_cart & 0x40) ? (to8_cart_vpage <= 4) ? to8_vcart_w :
43664377                         (write8_space_func)(STATIC_BANK1 + THOM_CART_BANK - 1) : SMH_NOP );
4367         if ( bank != old_bank )
4378         if ( bank != old_cart_bank )
43684379            LOG_BANK(( "mo6_update_cart_bank: CART is RAM bank %i (write-enable=%i)\n", to8_cart_vpage, (to8_reg_cart & 0x40) ? 1 : 0 ));
43694380      }
43704381      else if ( thom_cart_nb_banks == 4 )
r6180r6181
43724383         /* "JANE"-style cartridge bank switching */
43734384         memory_install_write8_handler( space, 0xb000, 0xefff, 0, 0, SMH_NOP );
43744385         bank = mo5_reg_cart & 3;
4375         if ( bank != old_bank )
4386         if ( bank != old_cart_bank )
43764387            LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i (A7CB style)\n", bank ));
43774388      }
43784389      else
r6180r6181
43834394         bank = 8 + to8_cart_vpage;
43844395         memory_install_write8_handler( space, 0xb000, 0xefff, 0, 0, write_enable ?
43854396                         (write8_space_func)(STATIC_BANK1 + THOM_CART_BANK - 1) :  SMH_NOP );
4386         if ( bank != old_bank )
4397         if ( bank != old_cart_bank )
43874398            LOG_BANK(( "mo6_update_cart_bank: CART is RAM bank %i (write-enable=%i) (MO5 compat.)\n", to8_cart_vpage, write_enable ? 1 : 0 ));
43884399      }
43894400   }
r6180r6181
43984409            bank = b + 6; /* BASIC 128 */
43994410         else
44004411            bank = b + 4;                      /* BASIC 1 */
4401         if ( bank != old_bank )
4412         if ( bank != old_cart_bank )
44024413            LOG_BANK(( "mo6_update_cart_bank: CART is internal ROM bank %i\n", b ));
44034414      }
44044415      else
r6180r6181
44104421            bank = thom_cart_bank % thom_cart_nb_banks;
44114422            memory_install_read8_handler( space, 0xbffc, 0xbfff, 0, 0, mo6_cartridge_r );
44124423         }
4413         if ( bank != old_bank )
4424         if ( bank != old_cart_bank )
44144425            LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i\n", bank ));
44154426      }
44164427   }
44174428
4418   old_bank = bank;
4429   old_cart_bank = bank;
44194430   memory_set_bank( machine, THOM_CART_BANK, bank );
44204431   memory_set_bank( machine, TO8_BIOS_BANK, b );
44214432}
r6180r6181
48554866   pia6821_ca1_w( sys_pia, 0, 0 );
48564867
48574868   /* memory */
4869   old_ram_bank = -1;
4870   old_cart_bank = -1;
48584871   to8_cart_vpage = 0;
48594872   to8_data_vpage = 0;
48604873   mo6_update_ram_bank(machine);
r6180r6181
51115124   pia6821_ca1_w( sys_pia, 0, 0 );
51125125
51135126   /* memory */
5127   old_ram_bank = -1;
5128   old_cart_bank = -1;
51145129   to8_cart_vpage = 0;
51155130   to8_data_vpage = 0;
51165131   mo6_update_ram_bank(machine);
src/mess/machine/pc_hdc.c
r6180r6181
8484#define CTL_PIO       0x00
8585#define CTL_DMA       0x01
8686
87static int idx = 0;                      /* contoller * 2 + drive */
87static int idx = 0;             /* controller * 2 + drive */
8888static int drv = 0;                      /* 0 master, 1 slave drive */
89static int cylinders[MAX_HARD] = {612,612,};    /* number of cylinders */
90static int rwc[MAX_HARD] = {613,613,};         /* recduced write current from cyl */
91static int wp[MAX_HARD] = {613,613,};         /* write precompensation from cyl */
92static int heads[MAX_HARD] = {4,4,};         /* heads */
93static int ecc[MAX_HARD] = {11,11,};         /* ECC bytes */
89static int cylinders[MAX_HARD];      /* number of cylinders */
90static int rwc[MAX_HARD];         /* reduced write current from cyl */
91static int wp[MAX_HARD];         /* write precompensation from cyl */
92static int heads[MAX_HARD];         /* heads */
93static int ecc[MAX_HARD];         /* ECC bytes */
9494
9595/* indexes */
96static int cylinder[MAX_HARD] = {0,};         /* current cylinder */
97static int head[MAX_HARD] = {0,};            /* current head */
98static int sector[MAX_HARD] = {0,};          /* current sector */
99static int sector_cnt[MAX_HARD] = {0,};         /* sector count */
100static int control[MAX_HARD] = {0,};            /* control */
96static int cylinder[MAX_HARD];         /* current cylinder */
97static int head[MAX_HARD];            /* current head */
98static int sector[MAX_HARD];          /* current sector */
99static int sector_cnt[MAX_HARD];      /* sector count */
100static int control[MAX_HARD];         /* control */
101101
102102static int csb[MAX_BOARD];            /* command status byte */
103103static int status[MAX_BOARD];         /* drive status */
r6180r6181
186186
187187   buffer = auto_alloc_array(machine, UINT8, 17*4*512);
188188
189   for (i = 0; i < MAX_HARD; i++)
190   {
191      cylinders[i] = 612;
192      rwc[i] = 613;
193      wp[i] = 613;
194      heads[i] = 4;
195      ecc[i] = 11;
196
197      /* indexes */
198      cylinder[i] = 0;
199      head[i] = 0;
200      sector[i] = 0;
201      sector_cnt[i] = 0;
202      control[i] = 0;
203   }
204
189205   /* init for all boards */
190206   for (i = 0; i < MAX_BOARD; i++)
191207   {
src/mess/machine/amigakbd.c
r6180r6181
1313
1414#define KEYBOARD_BUFFER_SIZE   256
1515
16static int kbd_index[4] = { 0, 1, 2, 3 };
16static int kbd_index[4];
1717static UINT8 *key_buf = NULL;
1818static int key_buf_pos = 0;
1919static int key_cur_pos = 0;
r6180r6181
100100
101101void amigakbd_init( running_machine *machine )
102102{
103   int i;
104
105   for (i=0; i<ARRAY_LENGTH(kbd_index); i++)
106      kbd_index[i] = i;
107
103108   /* allocate a keyboard buffer */
104109   key_buf = auto_alloc_array(machine, UINT8, KEYBOARD_BUFFER_SIZE );
105110   key_buf_pos = 0;
src/mess/machine/llc.c
r6180r6181
1212#include "includes/llc.h"
1313#include "devices/messram.h"
1414
15UINT8 code = 0;
15static UINT8 code = 0;
1616
1717static UINT8 llc1_key_state = 0;
1818
src/mess/machine/ti85.c
r6180r6181
14521452{
14531453   static UINT8* var_data = NULL;
14541454   static UINT32 var_file_number = 0;
1455   static char var_file_name[] = "00000000.85g";
1455   char var_file_name[16];
14561456   static int variable_number = 0;
14571457   mame_file * var_file;
14581458   static UINT8* var_file_data = NULL;
src/mess/machine/vectrex.c
r6180r6181
2929*********************************************************************/
3030
3131unsigned char vectrex_via_out[2];
32rgb_t vectrex_beam_color = RGB_WHITE;      /* the color of the vectrex beam */
32rgb_t vectrex_beam_color;      /* the color of the vectrex beam */
3333int vectrex_imager_status = 0;     /* 0 = off, 1 = right eye, 2 = left eye */
3434double vectrex_imager_freq;
3535emu_timer *vectrex_imager_timer;
r6180r6181
4444*********************************************************************/
4545
4646/* Colors for right and left eye */
47static rgb_t imager_colors[6] =
48{
49   RGB_WHITE, RGB_WHITE, RGB_WHITE, RGB_WHITE, RGB_WHITE, RGB_WHITE
50};
47static rgb_t imager_colors[6];
5148
5249/* Starting points of the three colors */
5350/* Values taken from J. Nelson's drawings*/
r6180r6181
353350
354351DRIVER_INIT(vectrex)
355352{
353   int i;
354
355   vectrex_beam_color = RGB_WHITE;
356   for (i=0; i<ARRAY_LENGTH(imager_colors); i++)
357      imager_colors[i] = RGB_WHITE;
358
356359   /*
357360     * Uninitialized RAM needs to return 0xff. Otherwise the mines in
358361     * the first level of Minestorm are not evenly distributed.
src/mess/drivers/v1050.c
r6180r6181
10051005   v1050_set_int(device->machine, INT_KEYBOARD, state);
10061006}
10071007
1008static msm8251_interface kb_8251_intf =
1008static const msm8251_interface kb_8251_intf =
10091009{
10101010   NULL,
10111011   NULL,
r6180r6181
10401040   v1050_set_int(device->machine, INT_RS_232, driver_state->rxrdy | driver_state->txrdy);
10411041}
10421042
1043static msm8251_interface sio_8251_intf =
1043static const msm8251_interface sio_8251_intf =
10441044{
10451045   sio_8251_txrdy_w,
10461046   NULL,
docs/messnew.txt
r6180r6181
258258
259259- Floppy support for TD0, IMD and CQM. [Miodrag Milanovic]
260260
261- Cleanups to use more *_NAME and *_CALL macros.  [Atari Ace]
261- Cleanups to use more *_NAME and *_CALL macros, headers and const correctness.
262  [Atari Ace]
262263
263264- Cleanups to add static/const qualifiers, and to remove dead prototypes and
264265  code.  [Atari Ace]

Previous 15994 Revisions Next


© 1998-2018 The MESS Team