From ada9016e8e561657fe8f076197b1b200abf87879 Mon Sep 17 00:00:00 2001 From: kara1001000 Date: Thu, 22 Oct 2015 17:13:11 +0300 Subject: more accurate colors for MikroMikko 1 --- src/mame/includes/mikromik.h | 1 + src/mame/video/mikromik.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h index 3565d77e8de..00e89ec99ff 100644 --- a/src/mame/includes/mikromik.h +++ b/src/mame/includes/mikromik.h @@ -127,6 +127,7 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); + DECLARE_PALETTE_INIT( mm1 ); }; diff --git a/src/mame/video/mikromik.c b/src/mame/video/mikromik.c index f0c93b80f7a..26654a31c85 100644 --- a/src/mame/video/mikromik.c +++ b/src/mame/video/mikromik.c @@ -72,7 +72,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( mm1_state::hgdc_display_pixels ) UINT16 data = m_video_ram[address >> 1]; for (int i = 0; i < 16; i++) { - if (BIT(data, i)) bitmap.pix32(y, x + i) = m_palette->pen(1); + if (BIT(data, i)) bitmap.pix32(y, x + i) = m_palette->pen(2); } } @@ -114,6 +114,13 @@ static GFXDECODE_START( mm1 ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 1 ) GFXDECODE_END +PALETTE_INIT_MEMBER( mm1_state, mm1 ) +{ + palette.set_pen_color(0, rgb_t(0x00,0x00,0x00)); + palette.set_pen_color(1, rgb_t(0x00,0x7F,0x0A)); // dark green ("highlight" mode color) + palette.set_pen_color(2, rgb_t(0x08,0xD0,0x1A)); // bright green (normal color) +} + //------------------------------------------------- // MACHINE_CONFIG_FRAGMENT( mm1m6_video ) @@ -128,7 +135,8 @@ MACHINE_CONFIG_FRAGMENT( mm1m6_video ) //MCFG_SCREEN_RAW_PARAMS(XTAL_18_720MHz, ...) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mm1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD("palette", 3) + MCFG_PALETTE_INIT_OWNER(mm1_state, mm1) MCFG_DEVICE_ADD(I8275_TAG, I8275, XTAL_18_720MHz/8) MCFG_I8275_CHARACTER_WIDTH(HORIZONTAL_CHARACTER_PIXELS) -- cgit v1.2.3-70-g09d2 From 28cf5d6e09cfb5d9f76e0ffae98fcc2b9eb5f37d Mon Sep 17 00:00:00 2001 From: Logan B Date: Tue, 10 Nov 2015 18:20:30 +1300 Subject: Make game names consistent (nw) Changing the "([ver]) (Prototype)" to "([ver], prototype)", like the more recently added bublbob2p. --- src/mame/drivers/taito_f3.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index e95f6ea1786..570034e603c 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -4131,7 +4131,7 @@ GAME( 1992, ridingfu, ridingf, f3_224b, f3, taito_f3_state, ridingf, ROT0, " GAME( 1992, gseeker, 0, f3_224b_eeprom, f3, taito_f3_state, gseeker, ROT90, "Taito Corporation Japan", "Grid Seeker: Project Storm Hammer (Ver 1.3O)", 0 ) GAME( 1992, gseekerj, gseeker, f3_224b_eeprom, f3, taito_f3_state, gseeker, ROT90, "Taito Corporation", "Grid Seeker: Project Storm Hammer (Ver 1.3J)", 0 ) GAME( 1992, gseekeru, gseeker, f3_224b_eeprom, f3, taito_f3_state, gseeker, ROT90, "Taito America Corporation", "Grid Seeker: Project Storm Hammer (Ver 1.3A)", 0 ) -GAME( 1992, commandw, 0, f3_224b, f3, taito_f3_state, commandw, ROT0, "Taito Corporation", "Command War - Super Special Battle & War Game (Ver 0.0J) (Prototype)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1992, commandw, 0, f3_224b, f3, taito_f3_state, commandw, ROT0, "Taito Corporation", "Command War - Super Special Battle & War Game (Ver 0.0J, prototype)", MACHINE_IMPERFECT_GRAPHICS ) /* Most of the football games share some GFX roms but shouldn't be considered clones unless they have the same Taito game code for the program roms */ GAME( 1993, cupfinal, 0, f3_224a, f3, taito_f3_state, cupfinal, ROT0, "Taito Corporation Japan", "Taito Cup Finals (Ver 1.0O 1993/02/28)", 0 ) GAME( 1993, hthero93, cupfinal, f3_224a, f3, taito_f3_state, cupfinal, ROT0, "Taito Corporation", "Hat Trick Hero '93 (Ver 1.0J 1993/02/28)", 0 ) @@ -4155,7 +4155,7 @@ GAME( 1994, hthero94, intcup94, f3_224a, f3, taito_f3_state, intcup94, ROT0, " GAME( 1994, kaiserkn, 0, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation Japan", "Kaiser Knuckle (Ver 2.1O 1994/07/29)", 0 ) GAME( 1994, kaiserknj,kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Kaiser Knuckle (Ver 2.1J 1994/07/29)", 0 ) GAME( 1994, gblchmp, kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito America Corporation", "Global Champion (Ver 2.1A 1994/07/29)", 0 ) -GAME( 1994, dankuga, kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Dan-Ku-Ga (Ver 0.0J 1994/12/13) (Prototype)", 0 ) +GAME( 1994, dankuga, kaiserkn, f3_224a, kn, taito_f3_state, kaiserkn, ROT0, "Taito Corporation", "Dan-Ku-Ga (Ver 0.0J 1994/12/13, prototype)", 0 ) GAME( 1994, dariusg, 0, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation Japan", "Darius Gaiden - Silver Hawk (Ver 2.5O 1994/09/19)", 0 ) GAME( 1994, dariusgj, dariusg, f3, f3, taito_f3_state, dariusg, ROT0, "Taito Corporation", "Darius Gaiden - Silver Hawk (Ver 2.5J 1994/09/19)", 0 ) GAME( 1994, dariusgu, dariusg, f3, f3, taito_f3_state, dariusg, ROT0, "Taito America Corporation", "Darius Gaiden - Silver Hawk (Ver 2.5A 1994/09/19)", 0 ) @@ -4176,11 +4176,11 @@ GAME( 1994, elvactr, 0, f3, f3, taito_f3_state, elvactr, ROT0, " GAME( 1994, elvactrj, elvactr, f3, f3, taito_f3_state, elvactr, ROT0, "Taito Corporation", "Elevator Action Returns (Ver 2.2J 1995/02/20)", 0 ) GAME( 1994, elvact2u, elvactr, f3, f3, taito_f3_state, elvactr, ROT0, "Taito America Corporation", "Elevator Action II (Ver 2.2A 1995/02/20)", 0 ) /* There is also a prototype Elevator Action II (US) pcb with the graphics in a different rom format (same program code) */ -GAME( 1994, recalh, 0, f3_eeprom,f3, taito_f3_state, recalh, ROT0, "Taito Corporation", "Recalhorn (Ver 1.42J 1994/5/11) (Prototype)", 0 ) +GAME( 1994, recalh, 0, f3_eeprom,f3, taito_f3_state, recalh, ROT0, "Taito Corporation", "Recalhorn (Ver 1.42J 1994/5/11, prototype)", 0 ) GAME( 1995, spcinv95, 0, f3_224a, f3, taito_f3_state, spcinv95, ROT270, "Taito Corporation Japan", "Space Invaders '95: The Attack Of Lunar Loonies (Ver 2.5O 1995/06/14)", 0 ) GAME( 1995, spcinv95u,spcinv95, f3_224a, f3, taito_f3_state, spcinv95, ROT270, "Taito America Corporation", "Space Invaders '95: The Attack Of Lunar Loonies (Ver 2.5A 1995/06/14)", 0 ) GAME( 1995, akkanvdr, spcinv95, f3_224a, f3, taito_f3_state, spcinv95, ROT270, "Taito Corporation", "Akkanbeder (Ver 2.5J 1995/06/14)", 0 ) -GAME( 1995, twinqix, 0, f3_224a, f3, taito_f3_state, twinqix, ROT0, "Taito America Corporation", "Twin Qix (Ver 1.0A 1995/01/17) (Prototype)", 0 ) +GAME( 1995, twinqix, 0, f3_224a, f3, taito_f3_state, twinqix, ROT0, "Taito America Corporation", "Twin Qix (Ver 1.0A 1995/01/17, prototype)", 0 ) GAME( 1995, quizhuhu, 0, f3, f3, taito_f3_state, quizhuhu, ROT0, "Taito Corporation", "Moriguchi Hiroko no Quiz de Hyuu!Hyuu! (Ver 2.2J 1995/05/25)", 0 ) GAME( 1995, pbobble2, 0, f3, f3, taito_f3_state, pbobbl2p, ROT0, "Taito Corporation Japan", "Puzzle Bobble 2 (Ver 2.3O 1995/07/31)", 0 ) GAME( 1995, pbobble2o,pbobble2, f3, f3, taito_f3_state, pbobble2, ROT0, "Taito Corporation Japan", "Puzzle Bobble 2 (Ver 2.2O 1995/07/20)", 0 ) @@ -4211,4 +4211,4 @@ GAME( 1997, popnpop, 0, f3, f3, taito_f3_state, popnpop, ROT0, " GAME( 1997, popnpopj, popnpop, f3, f3, taito_f3_state, popnpop, ROT0, "Taito Corporation", "Pop'n Pop (Ver 2.07J 1998/02/09)", 0 ) GAME( 1997, popnpopu, popnpop, f3, f3, taito_f3_state, popnpop, ROT0, "Taito Corporation", "Pop'n Pop (Ver 2.07A 1998/02/09)", 0 ) GAME( 1998, landmakr, 0, f3, f3, taito_f3_state, landmakr, ROT0, "Taito Corporation", "Land Maker (Ver 2.01J 1998/06/01)", 0 ) -GAME( 1998, landmakrp,landmakr, f3, f3, taito_f3_state, landmkrp, ROT0, "Taito Corporation", "Land Maker (Ver 2.02O 1998/06/02) (Prototype)", 0 ) +GAME( 1998, landmakrp,landmakr, f3, f3, taito_f3_state, landmkrp, ROT0, "Taito Corporation", "Land Maker (Ver 2.02O 1998/06/02, prototype)", 0 ) -- cgit v1.2.3-70-g09d2 From c69bc4a474c1b231597eb2eacaebea45bc57dc1d Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sat, 14 Nov 2015 18:24:13 +0000 Subject: mc6845: fixed hd6845 rasters in interlace mode - bbc now uses correct hd6845 - saa5050 outputs all 20 scanlines --- src/devices/video/mc6845.cpp | 19 +++++++++----- src/devices/video/mc6845.h | 7 ++--- src/devices/video/saa5050.cpp | 3 ++- src/mame/drivers/apricot.cpp | 2 +- src/mame/drivers/bbc.cpp | 60 ++++++++++++++++++++++++++++--------------- src/mame/includes/bbc.h | 18 +++++++++++-- src/mame/machine/bbc.cpp | 39 ++++++++++++++++++++-------- src/mame/video/bbc.cpp | 28 ++++++++------------ 8 files changed, 114 insertions(+), 62 deletions(-) diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index 553728e8412..642bc913935 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -220,7 +220,7 @@ WRITE8_MEMBER( mc6845_device::register_w ) case 0x06: m_vert_disp = data & 0x7f; break; case 0x07: m_vert_sync_pos = data & 0x7f; break; case 0x08: m_mode_control = data & 0xff; break; - case 0x09: m_max_ras_addr = data & 0x1f; if (MODE_INTERLACE_AND_VIDEO) m_max_ras_addr += m_interlace_adjust; break; + case 0x09: m_max_ras_addr = data & 0x1f; break; case 0x0a: m_cursor_start_ras = data & 0x7f; break; case 0x0b: m_cursor_end_ras = data & 0x1f; break; case 0x0c: m_disp_start_addr = ((data & 0x3f) << 8) | (m_disp_start_addr & 0x00ff); break; @@ -456,7 +456,7 @@ void mc6845_device::recompute_parameters(bool postload) { UINT16 hsync_on_pos, hsync_off_pos, vsync_on_pos, vsync_off_pos; - UINT16 video_char_height = m_max_ras_addr + 1; // fix garbage at the bottom of the screen (eg victor9k) + UINT16 video_char_height = m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust); // fix garbage at the bottom of the screen (eg victor9k) // Would be useful for 'interlace and video' mode support... // UINT16 frame_char_height = (MODE_INTERLACE_AND_VIDEO ? m_max_ras_addr / 2 : m_max_ras_addr) + 1; @@ -654,7 +654,7 @@ void mc6845_device::handle_line_timer() // For rudimentary 'interlace and video' support, m_raster_counter increments by 1 rather than the correct 2. // The correct test would be: // if ( m_raster_counter == (MODE_INTERLACE_AND_VIDEO ? m_max_ras_addr + 1 : m_max_ras_addr) ) - if ( m_raster_counter == m_max_ras_addr ) + if ( m_raster_counter == m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust) - 1 ) { /* Check if we have reached the end of the vertical area */ if ( m_line_counter == m_vert_char_total ) @@ -922,7 +922,7 @@ void mc6845_device::update_cursor_state() UINT8 mc6845_device::draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* compute the current raster line */ - UINT8 ra = y % (m_max_ras_addr + 1); + UINT8 ra = y % (m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust)); /* check if the cursor is visible and is on this scanline */ int cursor_visible = m_cursor_state && @@ -943,7 +943,7 @@ UINT8 mc6845_device::draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle if (MODE_ROW_COLUMN_ADDRESSING) { UINT8 cc = 0; - UINT8 cr = y / (m_max_ras_addr + 1); + UINT8 cr = y / (m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust)); UINT16 ma = (cr << 8) | cc; m_update_row_cb(bitmap, cliprect, ma, ra, y, m_horiz_disp, cursor_x, de, hbp, vbp); @@ -954,7 +954,7 @@ UINT8 mc6845_device::draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle } /* update MA if the last raster address */ - if (ra == m_max_ras_addr) + if (ra == m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust) - 1) m_current_disp_addr = (m_current_disp_addr + m_horiz_disp) & 0x3fff; return ra; @@ -1064,6 +1064,8 @@ void mc6845_device::device_start() m_line_address = 0; m_current_disp_addr = 0; m_disp_start_addr = 0; + m_noninterlace_adjust = 1; + m_interlace_adjust = 1; save_item(NAME(m_show_border_area)); save_item(NAME(m_visarea_adjust_min_x)); @@ -1173,6 +1175,11 @@ void hd6845_device::device_start() m_supports_status_reg_d6 = false; m_supports_status_reg_d7 = false; m_supports_transparent = false; + + // Non-interlace Mode, Interlace Sync Mode - When total number of rasters is RN, RN-1 shall be programmed. + m_noninterlace_adjust = 1; + // Interlace Sync & Video Mode - When total number of rasters is RN, RN-2 shall be programmed. + m_interlace_adjust = 2; } diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index c445fac2c33..f68a95a326e 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -167,7 +167,7 @@ public: void set_hpixels_per_column(int hpixels_per_column); /* updates the screen -- this will call begin_update(), - followed by update_row() reapeatedly and after all row + followed by update_row() repeatedly and after all row updating is complete, end_update() */ UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -283,7 +283,8 @@ protected: ************************/ bool m_show_border_area; /* visible screen area (false) active display (true) active display + blanking */ - int m_interlace_adjust; /* adjust max ras in interlace mode */ + int m_noninterlace_adjust; /* adjust max ras in non-interlace mode */ + int m_interlace_adjust; /* adjust max ras in interlace mode */ /* visible screen area adjustment */ int m_visarea_adjust_min_x; @@ -314,7 +315,7 @@ protected: * vblank/hblank timing not supported yet! */ mc6845_on_update_addr_changed_delegate m_on_update_addr_changed_cb; - /* if specified, this gets called for every change of the disply enable pin (pin 18) */ + /* if specified, this gets called for every change of the display enable pin (pin 18) */ devcb_write_line m_out_de_cb; /* if specified, this gets called for every change of the cursor pin (pin 19) */ diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index 12ab5d41a16..071fbf52ec9 100644 --- a/src/devices/video/saa5050.cpp +++ b/src/devices/video/saa5050.cpp @@ -12,6 +12,7 @@ TODO: + - interlace, use CRS to output odd/even fields - remote controller input - boxing @@ -535,7 +536,7 @@ WRITE_LINE_MEMBER( saa5050_device::lose_w ) m_ra++; m_ra %= 20; - if (m_ra == 19) + if (!m_ra) { if (m_double_height_bottom_row) m_double_height_bottom_row = false; diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 575c2672c02..dc9565e8641 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -401,7 +401,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") MCFG_MC6845_ADD("ic30", MC6845, "screen", XTAL_15MHz / 10) - MCFG_MC6845_INTERLACE_ADJUST(1) + MCFG_MC6845_INTERLACE_ADJUST(2) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(10) MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index cd183c3da02..ef1d8aa5446 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -30,6 +30,12 @@ ARM1 - ARM Evaluation System ADB20 - Master Compact + Acorn Business Computer + + ABC110 - 64K, 10MB HDD, Z80, CP/M 2.2 + ABC210/ACW443 - 4096K, 20MB HDD, 32016, PanOS + ABC310 - 1024K, 10MB HDD, 80286, DOS 3.1/GEM + ******************************************************************************/ /* Core includes */ @@ -136,17 +142,17 @@ static ADDRESS_MAP_START( bbca_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank4") AM_WRITE(bbc_memoryb4_w) /* 8000-bfff Paged ROM */ AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_NOP /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff SHEILA Address Page */ - AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0x06) AM_DEVREADWRITE("mc6845", mc6845_device, status_r, address_w) /* fe00-fe07 6845 CRTC Video controller */ - AM_RANGE(0xfe01, 0xfe01) AM_MIRROR(0x06) AM_DEVREADWRITE("mc6845", mc6845_device, register_r, register_w) + /* fe00-feff SHEILA Address Page */ + AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0x06) AM_DEVREADWRITE("hd6845", hd6845_device, status_r, address_w) /* fe00-fe07 6845 CRTC Video controller */ + AM_RANGE(0xfe01, 0xfe01) AM_MIRROR(0x06) AM_DEVREADWRITE("hd6845", hd6845_device, register_r, register_w) AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_r, control_w) /* fe08-fe0F 6850 ACIA Serial controller */ AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_r, data_w) AM_RANGE(0xfe10, 0xfe17) AM_READWRITE(bbc_fe_r, bbc_SerialULA_w) /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_NOP /* fe18-fe1f INTOFF/STATID # ECONET Interrupt Off / ID No. */ - AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON # ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + AM_RANGE(0xfe20, 0xfe2f) AM_READWRITE(bbc_fe_r, bbc_videoULA_w) /* R: fe20-fe2f INTON # ECONET Interrupt On */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selecta_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 74LS161 Paged ROM selector */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_NOP /* fe60-fe7f 6522 VIA # USER VIA */ AM_RANGE(0xfe80, 0xfe9f) AM_NOP /* fe80-fe9f 8271/1770 FDC # Floppy disc controller */ @@ -162,18 +168,18 @@ static ADDRESS_MAP_START( bbc_base, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_NOP /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff SHEILA Address Page */ - AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0x06) AM_DEVREADWRITE("mc6845", mc6845_device, status_r, address_w) /* fe00-fe07 6845 CRTC Video controller */ - AM_RANGE(0xfe01, 0xfe01) AM_MIRROR(0x06) AM_DEVREADWRITE("mc6845", mc6845_device, register_r, register_w) + /* fe00-feff SHEILA Address Page */ + AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0x06) AM_DEVREADWRITE("hd6845", hd6845_device, status_r, address_w) /* fe00-fe07 6845 CRTC Video controller */ + AM_RANGE(0xfe01, 0xfe01) AM_MIRROR(0x06) AM_DEVREADWRITE("hd6845", hd6845_device, register_r, register_w) AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_r, control_w) /* fe08-fe0F 6850 ACIA Serial controller */ AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_r, data_w) AM_RANGE(0xfe10, 0xfe17) AM_READWRITE(bbc_fe_r, bbc_SerialULA_w) /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_READ_PORT("STATID") /* fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. */ - AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + AM_RANGE(0xfe20, 0xfe2f) AM_READWRITE(bbc_fe_r, bbc_videoULA_w) /* R: fe20-fe2f INTON ECONET Interrupt On */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) /* fe60-fe7f 6522 VIA USER VIA */ - /* fe80-fe9f FDC Floppy disc controller */ + /* fe80-fe9f FDC Floppy disc controller */ AM_RANGE(0xfea0, 0xfebf) AM_READ(bbc_fe_r) /* fea0-febf 68B54 ADLC ECONET controller */ AM_RANGE(0xfec0, 0xfedf) AM_DEVREADWRITE("upd7002", upd7002_device, read, write) /* fec0-fedf uPD7002 Analogue to digital converter */ AM_RANGE(0xfee0, 0xfeff) AM_READ(bbc_fe_r) /* fee0-feff Tube ULA Tube system interface */ @@ -186,7 +192,7 @@ static ADDRESS_MAP_START( bbcb_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x4000, 0x7fff) AM_READ_BANK("bank3") AM_WRITE(bbc_memoryb3_w) /* 4000-7fff Regular Ram */ AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank4") AM_WRITE(bbc_memoryb4_w) /* 8000-bfff Paged ROM */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectb_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe80, 0xfe83) AM_DEVICE("i8271", i8271_device, map) /* fe80-fe83 8271 FDC Floppy disc controller */ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("i8271", i8271_device, data_r, data_w) /* fe84-fe9f 8271 FDC Floppy disc controller */ AM_IMPORT_FROM(bbc_base) @@ -198,7 +204,7 @@ static ADDRESS_MAP_START(bbcb1770_mem, AS_PROGRAM, 8, bbc_state) AM_RANGE(0x4000, 0x7fff) AM_READ_BANK("bank3") AM_WRITE(bbc_memoryb3_w) /* 4000-7fff Regular Ram */ AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank4") AM_WRITE(bbc_memoryb4_w) /* 8000-bfff Paged ROM */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectb_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe80, 0xfe83) AM_WRITE(bbc_wd1770_status_w) /* fe80-fe83 1770 FDC Drive control register */ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_t, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */ AM_IMPORT_FROM(bbc_base) @@ -211,7 +217,7 @@ static ADDRESS_MAP_START( bbcbp_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xafff) AM_READ_BANK("bank4") AM_WRITE(bbc_memorybp4_w) /* 8000-afff Paged ROM or 12K of SWRAM */ AM_RANGE(0xb000, 0xbfff) AM_READ_BANK("bank6") /* b000-bfff Rest of paged ROM area */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe80, 0xfe83) AM_WRITE(bbc_wd1770_status_w) /* fe80-fe83 1770 FDC Drive control register */ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_t, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */ AM_IMPORT_FROM(bbc_base) @@ -224,7 +230,7 @@ static ADDRESS_MAP_START( bbcbp128_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xafff) AM_READ_BANK("bank4") AM_WRITE(bbc_memorybp4_128_w) /* 8000-afff Paged ROM or 12K of SWRAM */ AM_RANGE(0xb000, 0xbfff) AM_READ_BANK("bank6") AM_WRITE(bbc_memorybp6_128_w) /* b000-bfff Rest of paged ROM area */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe80, 0xfe83) AM_WRITE(bbc_wd1770_status_w) /* fe80-fe83 1770 FDC Drive control register */ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_t, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */ AM_IMPORT_FROM(bbc_base) @@ -237,7 +243,7 @@ static ADDRESS_MAP_START( reutapm_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xafff) AM_READ_BANK("bank4") AM_WRITE(bbc_memorybp4_w) /* 8000-afff Paged ROM or 12K of SWRAM */ AM_RANGE(0xb000, 0xbfff) AM_READ_BANK("bank6") /* b000-bfff Rest of paged ROM area */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe80, 0xfe83) AM_NOP /* fe80-fe83 1770 FDC Drive control register */ AM_RANGE(0xfe84, 0xfe9f) AM_NOP /* fe84-fe9f 1770 FDC Floppy disc controller */ AM_IMPORT_FROM(bbc_base) @@ -758,11 +764,12 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) + //MCFG_SCREEN_RAW_PARAMS( XTAL_17_73447MHz / 4, 1024, 80, 80 + 640 + 48, 625, 12, 12 + 256 + 13 ) MCFG_SCREEN_SIZE(640, 256) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(128)) - MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) + MCFG_SCREEN_UPDATE_DEVICE("hd6845", hd6845_device, screen_update) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(bbc_state,bbc) @@ -771,7 +778,7 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) MCFG_SAA5050_SCREEN_SIZE(40, 25, 40) /* crtc */ - MCFG_MC6845_ADD("mc6845", MC6845, "screen", 2000000) + MCFG_MC6845_ADD("hd6845", HD6845, "screen", 2000000) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(12) MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row) @@ -875,6 +882,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass") MCFG_SOFTWARE_LIST_ADD("flop_ls_b", "bbcb_flop") + //MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop") MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_z80_flop") MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_32016_flop") MACHINE_CONFIG_END @@ -970,6 +978,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") + //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MACHINE_CONFIG_END @@ -990,6 +999,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") + //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MACHINE_CONFIG_END @@ -1041,6 +1051,7 @@ static MACHINE_CONFIG_DERIVED( reutapm, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") + //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MACHINE_CONFIG_END @@ -1077,7 +1088,8 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(128)) MCFG_SCREEN_SIZE(640, 256) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1) - MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) + MCFG_SCREEN_UPDATE_DEVICE("hd6845", hd6845_device, screen_update) + MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(bbc_state,bbc) @@ -1085,7 +1097,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SAA5050_SCREEN_SIZE(40, 25, 40) /* crtc */ - MCFG_MC6845_ADD("mc6845", MC6845, "screen", 2000000) + MCFG_MC6845_ADD("hd6845", HD6845, "screen", 2000000) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(12) MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row) @@ -1128,6 +1140,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b", "bbcb_flop") + //MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop") /* acia */ MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) @@ -1217,6 +1230,7 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") + //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") @@ -1278,12 +1292,16 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) /* eeprom pcd8572 */ //MCFG_DEVICE_REMOVE("rtc") + MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcmc) + MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcmc) + /* software lists */ MCFG_SOFTWARE_LIST_REMOVE("cass_ls_m") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") + //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("cart_ls_m") diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index 5ba80cb2472..e6122615b8f 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -34,6 +34,15 @@ #define RS232_TAG "rs232" +enum machine_type_t +{ + MODELA, + MODELB, + BPLUS, + MASTER, + COMPACT +}; + class bbc_state : public driver_device { public: @@ -41,7 +50,7 @@ public: driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), - m_mc6845(*this, "mc6845"), + m_hd6845(*this, "hd6845"), m_adlc(*this, "mc6854"), m_sn(*this, "sn76489"), m_trom(*this, "saa5050"), @@ -137,6 +146,9 @@ public: DECLARE_MACHINE_RESET(bbcm); DECLARE_VIDEO_START(bbcm); + DECLARE_MACHINE_START(bbcmc); + DECLARE_MACHINE_RESET(bbcmc); + DECLARE_PALETTE_INIT(bbc); UINT32 screen_update_bbc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(bbcb_vsync); @@ -190,7 +202,7 @@ public: private: required_device m_maincpu; required_device m_ram; - required_device m_mc6845; + required_device m_hd6845; optional_device m_adlc; optional_device m_sn; public: // HACK FOR MC6845 @@ -227,6 +239,8 @@ public: // HACK FOR MC6845 void check_interrupts(); + machine_type_t m_machinetype; + bool m_os01; // flag indicating whether OS 0.1 is being used int m_SWRAMtype; // this stores the DIP switch setting for the SWRAM type being used int m_Speech; // this stores the CONF setting for Speech enabled/disabled diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index d9aff723f59..79f735214a2 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -551,8 +551,8 @@ READ8_MEMBER(bbc_state::bbcm_r) if ((offset>=0x200) && (offset<=0x2ff)) /* SHEILA */ { myo = offset-0x200; - if ((myo>=0x00) && (myo<=0x06) && (myo+0x01) & 1) return m_mc6845->status_r(space, myo-0x00); /* Video controller */ - if ((myo>=0x01) && (myo<=0x07) && (myo & 1)) return m_mc6845->register_r(space, myo-0x01); + if ((myo>=0x00) && (myo<=0x06) && (myo+0x01) & 1) return m_hd6845->status_r(space, myo-0x00); /* Video controller */ + if ((myo>=0x01) && (myo<=0x07) && (myo & 1)) return m_hd6845->register_r(space, myo-0x01); if ((myo>=0x08) && (myo<=0x0e) && (myo+0x01) & 1) return m_acia ? m_acia->status_r(space, myo-0x08) : 0xfe; /* Serial controller */ if ((myo>=0x09) && (myo<=0x0f) && (myo & 1)) return m_acia ? m_acia->data_r(space, myo-0x09) : 0xfe; if ((myo>=0x10) && (myo<=0x17)) return 0xfe; /* Serial System Chip */ @@ -569,8 +569,8 @@ READ8_MEMBER(bbc_state::bbcm_r) if ((myo>=0x60) && (myo<=0x7f)) return m_via6522_1 ? m_via6522_1->read(space, myo-0x60) : 0xfe; if ((myo>=0x80) && (myo<=0x9f)) return 0xfe; if ((myo>=0xa0) && (myo<=0xbf)) return m_adlc ? m_adlc->read(space, myo & 0x03) : 0xfe; - if ((myo>=0xc0) && (myo<=0xdf)) return 0xfe; - if ((myo>=0xe0) && (myo<=0xff)) return 0xfe; + if ((myo>=0xc0) && (myo<=0xdf)) return 0xff; + if ((myo>=0xe0) && (myo<=0xff)) return 0xff; } return 0xfe; } @@ -582,8 +582,8 @@ WRITE8_MEMBER(bbc_state::bbcm_w) if ((offset>=0x200) && (offset<=0x2ff)) /* SHEILA */ { myo=offset-0x200; - if ((myo>=0x00) && (myo<=0x06) && (myo+0x01) & 1) m_mc6845->address_w(space, myo-0x00, data); /* Video Controller */ - if ((myo>=0x01) && (myo<=0x07) && (myo & 1)) m_mc6845->register_w(space, myo-0x01, data); + if ((myo>=0x00) && (myo<=0x06) && (myo+0x01) & 1) m_hd6845->address_w(space, myo-0x00, data); /* Video Controller */ + if ((myo>=0x01) && (myo<=0x07) && (myo & 1)) m_hd6845->register_w(space, myo-0x01, data); if ((myo>=0x08) && (myo<=0x0e) && (myo+0x01) & 1) if (m_acia) m_acia->control_w(space, myo-0x08, data); /* Serial controller */ if ((myo>=0x09) && (myo<=0x0f) && (myo & 1)) if (m_acia) m_acia->data_w(space, myo-0x09, data); if ((myo>=0x10) && (myo<=0x17)) bbc_SerialULA_w(space, myo-0x10, data); /* Serial System Chip */ @@ -893,7 +893,7 @@ WRITE8_MEMBER(bbc_state::bbcb_via_system_write_portb) } break; case 1: - if (m_rtc && m_MC146818_WR == 0) + if (m_machinetype == MASTER && m_MC146818_WR == 0) { /* BBC Master has NVRAM Here */ m_MC146818_WR = 1; @@ -911,7 +911,7 @@ WRITE8_MEMBER(bbc_state::bbcb_via_system_write_portb) } break; case 2: - if (m_rtc && m_MC146818_DS == 0) + if (m_machinetype == MASTER && m_MC146818_DS == 0) { /* BBC Master has NVRAM Here */ m_MC146818_DS = 1; @@ -976,7 +976,7 @@ WRITE8_MEMBER(bbc_state::bbcb_via_system_write_portb) } break; case 1: - if (m_rtc && m_MC146818_WR == 1) + if (m_machinetype == MASTER && m_MC146818_WR == 1) { /* BBC Master has NVRAM Here */ m_MC146818_WR = 0; @@ -994,7 +994,7 @@ WRITE8_MEMBER(bbc_state::bbcb_via_system_write_portb) } break; case 2: - if (m_rtc && m_MC146818_DS == 1) + if (m_machinetype == MASTER && m_MC146818_DS == 1) { /* BBC Master has NVRAM Here */ m_MC146818_DS = 0; @@ -1051,7 +1051,7 @@ WRITE8_MEMBER(bbc_state::bbcb_via_system_write_portb) } - if (m_rtc) + if (m_machinetype == MASTER) { //set the Address Select if (m_MC146818_AS != BIT(data,7)) @@ -1720,6 +1720,7 @@ void bbc_state::bbcm_setup_banks(memory_bank *membank, int banks, UINT32 shift, MACHINE_START_MEMBER(bbc_state, bbca) { + m_machinetype = MODELA; bbc_setup_banks(m_bank4, 4, 0, 0x4000); } @@ -1749,6 +1750,7 @@ MACHINE_RESET_MEMBER(bbc_state, bbca) MACHINE_START_MEMBER(bbc_state, bbcb) { + m_machinetype = MODELB; m_mc6850_clock = 0; bbc_setup_banks(m_bank4, 16, 0, 0x4000); } @@ -1771,6 +1773,7 @@ MACHINE_RESET_MEMBER(bbc_state, bbcb) MACHINE_START_MEMBER(bbc_state, bbcbp) { + m_machinetype = BPLUS; m_mc6850_clock = 0; m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcbp_direct_handler), this)); @@ -1795,6 +1798,7 @@ MACHINE_RESET_MEMBER(bbc_state, bbcbp) MACHINE_START_MEMBER(bbc_state, bbcm) { + m_machinetype = MASTER; m_mc6850_clock = 0; m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcm_direct_handler), this)); @@ -1818,3 +1822,16 @@ MACHINE_RESET_MEMBER(bbc_state, bbcm) bbcb_IC32_initialise(this); } + + +MACHINE_START_MEMBER(bbc_state, bbcmc) +{ + MACHINE_START_CALL_MEMBER(bbcm); + + m_machinetype = COMPACT; +} + +MACHINE_RESET_MEMBER(bbc_state, bbcmc) +{ + MACHINE_RESET_CALL_MEMBER(bbcm); +} \ No newline at end of file diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp index 5424db2c989..d4a16c4119e 100644 --- a/src/mame/video/bbc.cpp +++ b/src/mame/video/bbc.cpp @@ -76,10 +76,10 @@ unsigned int bbc_state::calculate_video_address(int ma,int ra) if (BIT(ma,13)) { // IC 10 and IC 11 - m = ((ma&0x3ff) | 0x3c00) | ((s&0x8)<<11); + m = ((ma & 0x3ff) | 0x3c00) | ((s & 0x8)<<11); } else { // IC 8 and IC 9 - m = ((ma&0xff)<<3) | (s<<11) | (ra&0x7); + m = ((ma & 0xff)<<3) | (s<<11) | (ra & 0x7); } if (m_memorySize == 16) return m & 0x3fff; @@ -144,12 +144,12 @@ WRITE8_MEMBER(bbc_state::bbc_videoULA_w) // Set the control register in the Video ULA case 0: m_videoULA_Reg = data; - m_videoULA_master_cursor_size = (m_videoULA_Reg>>7)&0x01; + m_videoULA_master_cursor_size = BIT(m_videoULA_Reg,7); m_videoULA_width_of_cursor = (m_videoULA_Reg>>5)&0x03; - m_videoULA_6845_clock_rate = (m_videoULA_Reg>>4)&0x01; + m_videoULA_6845_clock_rate = BIT(m_videoULA_Reg,4); m_videoULA_characters_per_line = (m_videoULA_Reg>>2)&0x03; - m_videoULA_teletext_normal_select = (m_videoULA_Reg>>1)&0x01; - m_videoULA_flash_colour_select = m_videoULA_Reg &0x01; + m_videoULA_teletext_normal_select = BIT(m_videoULA_Reg,1); + m_videoULA_flash_colour_select = BIT(m_videoULA_Reg,0); m_videoULA_palette_lookup = m_videoULA_flash_colour_select ? m_videoULA_palette0 : m_videoULA_palette1; @@ -161,16 +161,16 @@ WRITE8_MEMBER(bbc_state::bbc_videoULA_w) else m_pixels_per_byte = pixels_per_byte_set[m_videoULA_characters_per_line | (m_videoULA_6845_clock_rate<<2)]; - m_mc6845->set_hpixels_per_column(m_pixels_per_byte); + m_hd6845->set_hpixels_per_column(m_pixels_per_byte); if (m_videoULA_6845_clock_rate) - m_mc6845->set_clock(XTAL_16MHz/8); + m_hd6845->set_clock(XTAL_16MHz/8); else - m_mc6845->set_clock(XTAL_16MHz/16); + m_hd6845->set_clock(XTAL_16MHz/16); break; // Set a palette register in the Video ULA case 1: - int tpal = (data >> 4)&0x0f; - int tcol = data&0x0f; + int tpal = (data >> 4) & 0x0f; + int tcol = data & 0x0f; m_videoULA_palette0[tpal] = tcol; m_videoULA_palette1[tpal] = tcol<8 ? tcol : tcol^7; break; @@ -226,12 +226,6 @@ MC6845_UPDATE_ROW( bbc_state::crtc_update_row ) bitmap.pix32(y, (x_pos*m_pixels_per_byte)+pixelno) = rgb; } } - - if (ra == 18) - { - m_trom->lose_w(1); - m_trom->lose_w(0); - } } else { -- cgit v1.2.3-70-g09d2 From 1c79e53fbc4280c342c77a0fe3a2175eadfdfc4e Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sat, 14 Nov 2015 20:22:58 +0000 Subject: bbc: softlist additions/changes - added part_id to many items - added original protected floppies (FSD) --- hash/bbc_32016_flop.xml | 146 +- hash/bbc_65c102_flop.xml | 6 +- hash/bbc_68000_flop.xml | 39 + hash/bbc_80186_flop.xml | 177 +- hash/bbc_arm_flop.xml | 69 +- hash/bbc_z80_flop.xml | 205 +-- hash/bbca_cass.xml | 8 + hash/bbcb_cass.xml | 326 +++- hash/bbcb_flop.xml | 168 +- hash/bbcb_orig_flop.xml | 4462 ++++++++++++++++++++++++++++++++++++++++++++++ hash/bbcm_cass.xml | 4 +- 11 files changed, 5076 insertions(+), 534 deletions(-) create mode 100644 hash/bbc_68000_flop.xml create mode 100644 hash/bbcb_orig_flop.xml diff --git a/hash/bbc_32016_flop.xml b/hash/bbc_32016_flop.xml index d27f7000be1..454d6616c87 100644 --- a/hash/bbc_32016_flop.xml +++ b/hash/bbc_32016_flop.xml @@ -1,191 +1,109 @@ - + - + - - 1 PanOS Startup and Utilities v1.1 + + PanOS Version 1.10 System Disks 1985 Acorn Computers + - - - - 2 PanOS System v1.1 - 1985 - Acorn Computers - - - + + - - - - 3 FORTRAN 77 (PanOS) v1.1 - 1985 - Acorn Computers - - - + + - - - - 4 ISO PASCAL (PanOS) v1.1 - 1985 - Acorn Computers - - - + + - - - - 5 C (PanOS) v1.1 - 1985 - Acorn Computers - - - + + - - - - 6 Cambridge LISP (PanOS) v1.1 - 1985 - Acorn Computers - - - + + - - - - 7 Welcome Programs v1.1 - 1985 - Acorn Computers - - - + + - - 1 PanOS Startup and Utilities v1.4 + + PanOS Version 1.40 System Disks 1985 Acorn Computers + - - - - 2 PanOS System v1.4 - 1985 - Acorn Computers - - - + + - - - - 3 FORTRAN 77 (PanOS) v1.4 - 1985 - Acorn Computers - - - + + - - - - 4 ISO PASCAL (PanOS) v1.4 - 1985 - Acorn Computers - - - + + - - - - 5 C (PanOS) v1.4 - 1985 - Acorn Computers - - - + + - - - - 6 Cambridge LISP (PanOS) v1.4 - 1985 - Acorn Computers - - - + + - - - - 7 Welcome Programs v1.4 - 1985 - Acorn Computers - - - + + diff --git a/hash/bbc_65c102_flop.xml b/hash/bbc_65c102_flop.xml index e57500fa5e3..9770296374c 100644 --- a/hash/bbc_65c102_flop.xml +++ b/hash/bbc_65c102_flop.xml @@ -1,17 +1,17 @@ - + - + - 65C102 Co-Processor Support Disc + BBC Master 65C102 Co-Processor Support Disc 1983 Acorn Computers diff --git a/hash/bbc_68000_flop.xml b/hash/bbc_68000_flop.xml new file mode 100644 index 00000000000..8f4c7b3407c --- /dev/null +++ b/hash/bbc_68000_flop.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + Casper Support Discs + 1986 + Delcomm + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hash/bbc_80186_flop.xml b/hash/bbc_80186_flop.xml index d6416305ce5..55021a08a47 100644 --- a/hash/bbc_80186_flop.xml +++ b/hash/bbc_80186_flop.xml @@ -1,230 +1,135 @@ - + - + - - 512 Disc 1 DOS Plus Boot v2.1 + + BBC Master 512 System Discs 1986 Acorn Computers + - - - - 512 Disc 1 DOS Plus Boot v1.2a - 1986 - Acorn Computers - - - + + - - - - 512 Disc 1 DOS Plus Boot v1.2 - 1986 - Acorn Computers - - - + + - - - - 512 Disc 2 GEM Applications - 1986 - Acorn Computers - - - + + - - - - 512 Disc 3 GEM Data - 1986 - Acorn Computers - - - + + - - - - 512 Disc 4 Miscellaneous - 1986 - Acorn Computers - - - + + - - Dabs Shareware Vol.1 Disc 1 - 19?? + + Dabs Shareware Vol.1 + 1988 Dabs Press + - - - - Dabs Shareware Vol.1 Disc 2 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.1 Disc 3 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.1 Disc 4 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.1 Disc 5 - 19?? - Dabs Press - - - + + - - Dabs Shareware Vol.2 Disc 1 - 19?? + + Dabs Shareware Vol.2 + 1988 Dabs Press + - - - - Dabs Shareware Vol.2 Disc 2 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.2 Disc 3 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.2 Disc 4 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.2 Disc 5 - 19?? - Dabs Press - - - + + - - - - Dabs Shareware Vol.2 Bonus - 19?? - Dabs Press - - - + + diff --git a/hash/bbc_arm_flop.xml b/hash/bbc_arm_flop.xml index 60f75068514..4e62f65f670 100644 --- a/hash/bbc_arm_flop.xml +++ b/hash/bbc_arm_flop.xml @@ -1,76 +1,55 @@ - + - + - - ARM Evaluation System Disc 1 + + ARM Evaluation System Discs 1986 Acorn Computers + - + - - - - ARM Evaluation System Disc 2 - 1986 - Acorn Computers - - - + + - + - - - - ARM Evaluation System Disc 3 - 1986 - Acorn Computers - - - + + - + - - - - ARM Evaluation System Disc 4 - 1986 - Acorn Computers - - - + + - + - - - - ARM Evaluation System Disc 5 - 1986 - Acorn Computers - - - + + + + + + + + - + diff --git a/hash/bbc_z80_flop.xml b/hash/bbc_z80_flop.xml index 6cff60c7cd5..c9030b24eb6 100644 --- a/hash/bbc_z80_flop.xml +++ b/hash/bbc_z80_flop.xml @@ -1,261 +1,140 @@ - + - + - - Acorn CP/M System Disc 1 + + Acorn CP/M System Discs 1984 Acorn - + - - - - Acorn CP/M System Disc 2 - 1984 - Acorn - - - + + - - - - Acorn CP/M System Disc 3 - 1984 - Acorn - - - + + - - - - Acorn CP/M System Disc 4 - 1984 - Acorn - - - + + - - - - Acorn CP/M System Disc 5 - 1984 - Acorn - - - - + + - - - - Acorn CP/M System Disc 6 - 1984 - Acorn - - - - + + - - - - Acorn CP/M System Disc 7 - 1984 - Acorn - - - - + + - - CP/M Utilities Disc + + Acorn CP/M Program Discs 1984 Acorn + - - - - BASIC Program Disc - 1984 - Acorn - - - + + - - - - CIS COBOL Program Disc - 1984 - Acorn - - - + + - - - - MemoPlan Program Disc - 1984 - Acorn - - - + + - - - - GraphPlan Program Disc - 1984 - Acorn - - - + + - - - - FilePlan Program Disc - 1984 - Acorn - - - + + - - - - Accountant Program Disc - 1984 - Acorn - - - + + - - - - Accountant Data Disc - 1984 - Acorn - - - + + - - - - Nucleus Definitions Program Disc - 1984 - Acorn - - - + + - - - - Nucleus Report Program Disc - 1984 - Acorn - - - + + - - - - Nucleus Parameter File Program Disc - 1984 - Acorn - - - + + - - - - Start Of Day Disc - 1984 - Acorn - - - + + diff --git a/hash/bbca_cass.xml b/hash/bbca_cass.xml index 5997bd81cd1..0ca9c057696 100644 --- a/hash/bbca_cass.xml +++ b/hash/bbca_cass.xml @@ -78,11 +78,13 @@ Acornsoft + + @@ -94,31 +96,37 @@ 1982 I.J.K. + + + + + + diff --git a/hash/bbcb_cass.xml b/hash/bbcb_cass.xml index 24df9e99c88..c5fb7f8197a 100644 --- a/hash/bbcb_cass.xml +++ b/hash/bbcb_cass.xml @@ -65,7 +65,7 @@ 3D Convoy 198? - Doctorsoft + Doctor Soft @@ -222,7 +222,7 @@ 747 (Early) 1983 - Doctorsoft + Doctor Soft @@ -233,13 +233,15 @@ 747 1983 - Doctorsoft + Doctor Soft + + @@ -525,7 +527,7 @@ Airwolf - 198? + 1985 Elite @@ -619,21 +621,25 @@ 1986 Riverdale + + + + @@ -667,11 +673,13 @@ 19?? Lee + + @@ -761,11 +769,13 @@ 1983 Software Invasion + + @@ -1024,21 +1034,25 @@ 1987 Elk Adventure Club + + + + @@ -1149,11 +1163,13 @@ 1987 Superior Software + + @@ -1459,8 +1475,8 @@ - Block Buster - 198? + Blockbuster + 1984 Micro Power @@ -1754,21 +1770,25 @@ 19?? J Keyne + + + + @@ -1941,7 +1961,7 @@ - + Car Wars/Planet of the Aliens 1982 @@ -2026,11 +2046,13 @@ 1984 MRM Software + + @@ -2623,7 +2645,7 @@ Commando - 198? + 1985 Elite @@ -2648,36 +2670,43 @@ 198? CDS + + + + + + + @@ -2916,7 +2945,7 @@ - Countdown To Doom + Countdown to Doom 1982 Acornsoft @@ -2932,11 +2961,13 @@ 19?? Selec + + @@ -3129,11 +3160,13 @@ 198? Cumana + + @@ -3211,11 +3244,13 @@ 198? Ocean + + @@ -3383,11 +3418,13 @@ Voltmace + + @@ -3411,11 +3448,13 @@ Visions + + @@ -4115,7 +4154,7 @@ E-Type - 1989 + 1990 4th Dimension @@ -4593,7 +4632,7 @@ Fortress - 198? + 1984 Pace @@ -5036,21 +5075,25 @@ 1983 Salamander + + + + @@ -5062,16 +5105,19 @@ 1983 Salamander + + + @@ -5218,17 +5264,19 @@ 1983 MGB Software + + - + Gold Digger 1984 @@ -5309,7 +5357,7 @@ Gorf 1983 - Doctorsoft + Doctor Soft @@ -5352,15 +5400,17 @@ - Graphic Adventure Creator + The Graphic Adventure Creator 1986 Incentive + + @@ -5612,7 +5662,7 @@ Happy Numbers 198? - Bourne + Bourne Educational Software @@ -5812,7 +5862,7 @@ Holed Out Extra Courses Vol.1 - 19?? + 1990 4th Dimension @@ -5823,7 +5873,7 @@ Holed Out Extra Courses Vol.2 - 19?? + 1990 4th Dimension @@ -6024,7 +6074,7 @@ Hyper Sports - 1984 + 1985 Imagine @@ -6047,16 +6097,18 @@ Icarus - 19?? + 1988 Mandarin - - + + + - - + + + @@ -6141,7 +6193,7 @@ Impossible Mission - 198? + 1985 U.S. Gold @@ -6174,7 +6226,7 @@ Indoor Sports - 198? + 1988 Tynesoft @@ -6232,11 +6284,13 @@ 198? Lee + + @@ -6363,11 +6417,13 @@ 198? Central Computing + + @@ -6556,8 +6612,8 @@ Jump Jet - 198? - Doctorsoft + 1984 + Doctor Soft @@ -6622,7 +6678,7 @@ Kayleth - 198? + 1986 U.S. Gold @@ -6811,7 +6867,7 @@ Kourtyard - 19?? + 1988 Godax @@ -6834,7 +6890,7 @@ Kremlin 1983 - Doctorsoft + Doctor Soft @@ -7181,11 +7237,13 @@ 1985 Mirrorsoft + + @@ -7230,21 +7288,25 @@ 1986 Melbourne House + + + + @@ -7368,16 +7430,19 @@ 1987 Elk Adventure Club + + + @@ -7431,7 +7496,7 @@ Map Rally 198? - Bourne + Bourne Educational Software @@ -7563,8 +7628,8 @@ - Mega Apocalypse - 198? + Mega-Apocalypse + 1988 Martech @@ -7643,14 +7708,16 @@ Mexico 86 - 198? + 1986 Qualsoft + + @@ -7816,7 +7883,7 @@ Missile Attack 1983 - Doctorsoft + Doctor Soft @@ -8042,11 +8109,13 @@ 198? Slippery Slug + + @@ -8168,11 +8237,13 @@ 198? Hybrid + + @@ -8184,6 +8255,7 @@ 19?? GTM + @@ -8200,11 +8272,13 @@ 19?? Duckworth + + @@ -8315,11 +8389,13 @@ 19?? Central Computing + + @@ -8450,7 +8526,7 @@ Not a Penny More, Not a Penny Less - 198? + 1987 Domark @@ -8548,9 +8624,9 @@ - Osprey - 19?? - Bourne + Osprey! + 198? + Bourne Educational Software @@ -8869,8 +8945,8 @@ Phantom Combat - 1986 - Doctorsoft + 1985 + Doctor Soft @@ -8972,11 +9048,13 @@ 1989 Superior Software + + @@ -8984,13 +9062,13 @@ - Pipemania - 1988 - Superior Software + Pipe Mania + 1989 + Empire - + @@ -9667,11 +9745,13 @@ 1987 Elk Adventure Club + + @@ -9883,16 +9963,19 @@ 1986 Robico + + + @@ -9949,11 +10032,13 @@ Larsoft + + @@ -10091,21 +10176,25 @@ Elk Adventure Club + + + + @@ -10271,11 +10360,13 @@ 1984 Triffid Software + + @@ -10287,6 +10378,7 @@ 1984 Triffid Software + @@ -10739,7 +10831,7 @@ Skirmish - 19?? + 1988 Godax @@ -11036,16 +11128,19 @@ 198? Qualsoft + + + @@ -11259,7 +11354,7 @@ Space Shuttle (Microdeal) - 198? + 1983 Microdeal @@ -11340,11 +11435,13 @@ 198? Sullis + + @@ -11456,11 +11553,13 @@ 1990 CDS + + @@ -11472,11 +11571,13 @@ 1988 Alternative + + @@ -11605,7 +11706,7 @@ - Star Fleet Encounter + Starfleet Encounter 1984 Micro Power @@ -11684,7 +11785,7 @@ Star Quake - 19?? + 1987 Bubble Bus @@ -11732,16 +11833,19 @@ 1987 Elk Adventure Club + + + @@ -11964,11 +12068,13 @@ 19?? Central Computing + + @@ -11981,11 +12087,13 @@ 19?? Central Computing + + @@ -12015,7 +12123,7 @@ - Strykers Run + Stryker's Run 1986 Superior Software @@ -12063,21 +12171,25 @@ 1986 Riverdale + + + + @@ -12377,7 +12489,7 @@ Tarzan (Martech) - 198? + 1987 Martech @@ -12468,11 +12580,13 @@ 198? CRL + + @@ -12484,11 +12598,13 @@ 198? CRL + + @@ -12556,11 +12672,13 @@ 1989 Impact + + @@ -12613,7 +12731,7 @@ The Dam Busters - 198? + 1985 U.S. Gold @@ -12627,16 +12745,19 @@ 1988 DW Gore + + + @@ -12659,11 +12780,13 @@ 198? Quicksilva + + @@ -13022,21 +13145,25 @@ 1983 Gemini + + + + @@ -13115,16 +13242,19 @@ 1988 Alternative + + + @@ -13136,16 +13266,19 @@ 1988 Alternative + + + @@ -13157,16 +13290,19 @@ 1988 Alternative + + + @@ -13178,16 +13314,19 @@ 1988 Alternative + + + @@ -13199,16 +13338,19 @@ 1988 Alternative + + + @@ -13220,16 +13362,19 @@ 1988 Alternative + + + @@ -13241,16 +13386,19 @@ 1988 Alternative + + + @@ -13262,16 +13410,19 @@ 1988 Alternative + + + @@ -13283,16 +13434,19 @@ 1988 Alternative + + + @@ -13395,21 +13549,25 @@ 19?? David McKeran + + + + @@ -13824,7 +13982,7 @@ White Knight Mk11 - 198? + 1983 BBC Soft @@ -13835,7 +13993,7 @@ White Knight Mk12 - 198? + 1985 BBC Soft @@ -13959,7 +14117,7 @@ Wolfpack 3 1983 - Doctorsoft + Doctor Soft @@ -14476,7 +14634,7 @@ Animal, Vegetable, Mineral 198? - Bourne + Bourne Educational Software @@ -14489,11 +14647,13 @@ 198? Glentop + + @@ -14505,11 +14665,13 @@ 198? Addison-Wesley + + @@ -14518,8 +14680,8 @@ Bert Boot - 198? - HS + 1984 + H.S.Software @@ -14532,21 +14694,25 @@ 1985 ASK + + + + @@ -14580,11 +14746,13 @@ 198? Macmillian + + @@ -14643,11 +14811,13 @@ 1985 Mirrorsoft + + @@ -14780,11 +14950,13 @@ 198? Chalksoft + + @@ -15057,8 +15229,8 @@ Roadcraft 1 - 198? - HS + 1984 + H.S.Software @@ -15146,8 +15318,8 @@ Timeman One - 198? - Bourne + 1983 + Bourne Educational Software @@ -15158,7 +15330,7 @@ Timeman Two 198? - Bourne + Bourne Educational Software @@ -15171,11 +15343,13 @@ 198? Macmillian + + @@ -15229,8 +15403,8 @@ Wordhang - 198? - Bourne + 1983 + Bourne Educational Software @@ -15272,9 +15446,9 @@ - World Wise + World-Wise 198? - Bourne + Bourne Educational Software @@ -15284,7 +15458,7 @@ Spooky Manor - 198? + 1984 Acornsoft @@ -15325,11 +15499,13 @@ 198? Macmillian + + @@ -15378,21 +15554,25 @@ 198? Macmillian + + + + @@ -15402,13 +15582,15 @@ AMX Art 198? - AMX + Advanced Memory Systems + + @@ -15420,11 +15602,13 @@ 198? Screenplay + + @@ -15525,11 +15709,13 @@ 1984 Addison-Wesley + + @@ -15590,11 +15776,13 @@ Acornsoft + + diff --git a/hash/bbcb_flop.xml b/hash/bbcb_flop.xml index 295a030428b..3e843d889a5 100644 --- a/hash/bbcb_flop.xml +++ b/hash/bbcb_flop.xml @@ -15,10 +15,13 @@ + + 3D Bomb Alley 1983 Software Invasion + @@ -26,6 +29,18 @@ + + Arcade Soccer + 1989 + 4th Dimension + + + + + + + + Cute To Kill: Beyond Infinity 1987 @@ -36,7 +51,7 @@ - + Elite 1984 @@ -59,6 +74,18 @@ + + E-Type + 1990 + 4th Dimension + + + + + + + + Eyes 1984 @@ -81,10 +108,82 @@ + + Giant Killer + 1987 + Topologika + + + + + + + + + + Holed Out + 1989 + 4th Dimension + + + + + + + + + + Holed Out Extra Courses Vol.1 + 1990 + 4th Dimension + + + + + + + + + + Holed Out Extra Courses Vol.2 + 1990 + 4th Dimension + + + + + + + + + + The Hunt: Search for Shauna + 1987 + Robico + + + + + + + + + + Inertia + 1990 + 4th Dimension + + + + + + + + - Mega Apocalypse + Mega-Apocalypse 1988 - Martech (Unreleased) + Martech @@ -92,6 +191,18 @@ + + Nevryon + 1991 + 4th Dimension + + + + + + + + Superior Software - Games on Disc 1983 @@ -107,6 +218,7 @@ Welcome and Disc Utils 1982 Acorn + @@ -114,4 +226,54 @@ + + U.I.M. + 1989 + 4th Dimension + + + + + + + + + + White Magic + 1989 + 4th Dimension + + + + + + + + + + White Magic 2 + 1989 + 4th Dimension + + + + + + + + + + + + World Without Words + 198? + 4mation + + + + + + + + diff --git a/hash/bbcb_orig_flop.xml b/hash/bbcb_orig_flop.xml new file mode 100644 index 00000000000..38ab4b488a4 --- /dev/null +++ b/hash/bbcb_orig_flop.xml @@ -0,0 +1,4462 @@ + + + + + + + + + + + + + + + + + Magic Mushrooms + 1985 + Acornsoft + + + + + + + + + + Arcadians + 1982 + Acornsoft + + + + + + + + + + Arcadians (40/80t) + 1982 + Acornsoft + + + + + + + + + + Boxer (40/80t) + 1984 + Acornsoft + + + + + + + + + + Hopper (40/80t) + 1983 + Acornsoft + + + + + + + + + + Volcano + 1984 + Acornsoft + + + + + + + + + + Meteors + 1982 + Acornsoft + + + + + + + + + + Labyrinth + 1984 + Acornsoft + + + + + + + + + + Black Box and Gambit + 198? + Acornsoft + + + + + + + + + + Meteor Mission + 1983 + Acornsoft + + + + + + + + + + Tetrapod + 1984 + Acornsoft + + + + + + + + + + Firebug + 1984 + Acornsoft + + + + + + + + + + Snapper + 1982 + Acornsoft + + + + + + + + + + Drogna + 1983 + Acornsoft + + + + + + + + + + Go + 1984 + Acornsoft + + + + + + + + + + Maze + 1982 + Acornsoft + + + + + + + + + + Quondam + 1984 + Acornsoft + + + + + + + + + + Bouncer + 1984 + Acornsoft + + + + + + + + + + Revs + 1984 + Acornsoft + + + + + + + + + + Revs 4 Tracks + 1985 + Acornsoft + + + + + + + + + + Acheton + 1984 + Acornsoft + + + + + + + + + + + + + + + + + Monsters + 1982 + Acornsoft + + + + + + + + + + Monsters (40t) + 1982 + Acornsoft + + + + + + + + + + Snooker + 1983 + Acornsoft + + + + + + + + + + Carousel + 1983 + Acornsoft + + + + + + + + + + Free Fall + 1983 + Acornsoft + + + + + + + + + + Crazy Tracer + 1983 + Acornsoft + + + + + + + + + + Kingdom of Hamil + 1983 + Acornsoft + + + + + + + + + + Starship Command + 1983 + Acornsoft + + + + + + + + + + Countdown to Doom + 1984 + Acornsoft + + + + + + + + + + Missile Base + 1982 + Acornsoft + + + + + + + + + + Philosopher's Quest + 1984 + Acornsoft + + + + + + + + + + Aviator + 1983 + Acornsoft + + + + + + + + + + Sphinx Adventure + 1983 + Acornsoft + + + + + + + + + + Planetoid + 1982 + Acornsoft + + + + + + + + + + Planetoid (40t) + 1982 + Acornsoft + + + + + + + + + + Super Invaders + 1982 + Acornsoft + + + + + + + + + + Super Invaders (40t) + 1982 + Acornsoft + + + + + + + + + + Rocket Raid + 1982 + Acornsoft + + + + + + + + + + Shirley Conran's Magic Garden + 1983 + Acornsoft + + + + + + + + + + Spooky Manor + 1984 + Acornsoft + + + + + + + + + + Peeko-Computer + 198? + Acornsoft + + + + + + + + + + Business Games + 198? + Acornsoft + + + + + + + + + + Microtext + 1983 + Acornsoft + + + + + + + + + + Elite (Demo) + 1984 + Acornsoft + + + + + + + + + Printer Driver Generator + 198? + Acornsoft + + + + + + + + + + FORTH + 1982 + Acornsoft + + + + + + + + + + Jars + 198? + Acornsoft + + + + + + + + + + Chemical Analysis + 198? + Acornsoft + + + + + + + + + + JCB Digger + 1983 + Acornsoft + + + + + + + + + + Home Education + 1985 + Acornsoft + + + + + + + + + + Omega Orb + 1986 + Audiogenic + + + + + + + + + Thunderstruck 2: Mind Master + 1986 + Audiogenic + + + + + + + + + Blast! + 1989 + Audiogenic + + + + + + + + + Psycastria + 1986 + Audiogenic + + + + + + + + + Breakthrough + 1990 + Audiogenic + + + + + + + + + Shark + 1988 + Audiogenic + + + + + + + + + Impact + 1987 + Audiogenic + + + + + + + + + Ziggy + 1987 + Audiogenic + + + + + + + + + Ransack! + 1987 + Audiogenic + + + + + + + + + Despatch Rider + 1987 + Audiogenic + + + + + + + + + Helter Skelter + 1990 + Audiogenic + + + + + + + + + Fab Four Vol.1 + 1990 + Audiogenic + + + + + + + + + + + + + + + + BBC Bonanza + 1987 + Audiogenic + + + + + + + + + + + + + + + + Emlyn Hughes Arcade Quiz + 1991 + Audiogenic + + + + + + + + + Loopz + 1990 + Audiogenic + + + + + + + + + Sphere of Destiny + 1986 + Audiogenic + + + + + + + + + Colossus 4 Chess + 1988 + CDS + + + + + + + + + + + + + + + + Infinity + 1989 + White Panther + + + + + + + + + Star Quake + 1987 + Bubble Bus + + + + + + + + + White Knight Mk12 + 1985 + BBC Soft + + + + + + + + + Fire Track + 1987 + Aardvark + + + + + + + + + Fortress + 1984 + Pace + + + + + + + + + XOR (A&B Computing) (alt) + 1987 + Logotron + + + + + + + + + XOR (A&B Computing) + 1987 + Logotron + + + + + + + + + XOR + 1987 + Logotron + + + + + + + + + XOR Designer + 1987 + Logotron + + + + + + + + + Sink the Bismarck + 1986 + Design People + + + + + + + + + The Sentinel + 1986 + Firebird + + + + + + + + + Evening Star + 1987 + Hewson Consultants + + + + + + + + + Beach Head + 1984 + U.S. Gold + + + + + + + + + Apocalypse (Command) + 1987 + Command + + + + + + + + + Village of Lost Souls + 1987 + Robico + + + + + + + + + The Hunt: Search for Shauna + 1987 + Robico + + + + + + + + + Vu-Type + 1984 + BBC Soft + + + + + + + + + Battle of Britain + 1987 + Design People + + + + + + + + + The Rick Hanson Trilogy - Saga of a Spy + 1986 + Robico + + + + + + + + + Blue Ribbon Games Disk No.1 + 1985 + Blue Ribbon + + + + + + + + + Blue Ribbon Games Disk No.2 + 1985 + Blue Ribbon + + + + + + + + + Blue Ribbon Games Disk No.3 + 1985 + Blue Ribbon + + + + + + + + + Jump Jet + 1985 + Anirog + + + + + + + + + W.A.R. + 1986 + Martech + + + + + + + + + Yie Ar Kung Fu + 1984 + Imagine + + + + + + + + + The Dam Busters + 1985 + U.S. Gold + + + + + + + + + Impossible Mission + 1985 + U.S. Gold + + + + + + + + + Bruce Lee + 1985 + U.S. Gold + + + + + + + + + Hyper Sports + 1985 + Imagine + + + + + + + + + Paperboy + 1984 + Elite + + + + + + + + + Airwolf + 1985 + Elite + + + + + + + + + Commando + 1985 + Elite + + + + + + + + + Arkanoid + 1987 + Imagine + + + + + + + + + Raid Over Moscow + 1986 + U.S. Gold + + + + + + + + + The Way of the Exploding Fist + 1985 + Melbourne House + + + + + + + + + Strike Force Harrier + 1986 + Mirrorsoft + + + + + + + + + Tetris + 1987 + Mirrorsoft + + + + + + + + + Pipe Mania + 1989 + Empire + + + + + + + + + Tarzan (Martech) + 1987 + Martech + + + + + + + + + Samantha Fox Strip Poker + 1986 + Martech + + + + + + + + + Kayleth + 1986 + U.S. Gold + + + + + + + + + Skirmish + 1988 + Godax + + + + + + + + + Kourtyard + 1988 + Godax + + + + + + + + + Stranger Danger + 1988 + Roger Hargreaves + + + + + + + + + Mega-Apocalypse + 1988 + Martech + + + + + + + + + Cholo + 1986 + Firebird + + + + + + + + + Icarus + 1988 + Mandarin + + + + + + + + + The Musicsoft Collection + 1986 + Duckworth + + + + + + + + + Midway + 1988 + Design People + + + + + + + + + Concept Keyboard Podd + 1988 + ESM + + + + + + + + + The Graphic Adventure Creator + 1986 + Incentive + + + + + + + + + Buffers + 1986 + FSoft + + + + + + + + + Music Maker + 1983 + FSoft + + + + + + + + + Krakout + 1988 + Gremlin + + + + + + + + + 3D Pool + 1989 + Firebird + + + + + + + + + Red Arrows + 1985 + Database + + + + + + + + + Phantom Combat (BBC Series) + 1985 + Doctor Soft + + + + + + + + + Phantom Combat (BBC 'B' 32K) + 1985 + Doctor Soft + + + + + + + + + Phantom Combat (BBC B & 'Plus') + 1985 + Doctor Soft + + + + + + + + + Crystal Castles + 1986 + U.S. Gold + + + + + + + + + Daley Thompson's Super-Test + 1985 + Ocean + + + + + + + + + 3D Graphics Development System + 1985 + Glentop Publishers + + + + + + + + + + + + + + + + Diagnostics Disc + 1985 + Watford Electronics + + + + + + + + + Disc Debug and Copy All + 198? + <unknown> + + + + + + + + + Disc Executor + 198? + Vision Software + + + + + + + + + Moon Cresta (no Lenslok) + 1986 + Incentive + + + + + + + + + Moon Cresta + 1986 + Incentive + + + + + + + + + BBC Mastermind Quizmaster + 1984 + Mirrorsoft-Ivan Berg + + + + + + + + + BBC Mastermind + 1984 + Mirrorsoft-Ivan Berg + + + + + + + + + The Times Crosswords Vol.1 + 1988 + The Times + + + + + + + + + + + + + + + + AMX Pagemaker + 1986 + Advanced Memory Systems + + + + + + + + + Tesselator + 1984 + Addison-Wesley + + + + + + + + + D-Logic + 1983 + SciCAL Software + + + + + + + + + Uridium + 1987 + Hewson Consultants + + + + + + + + + The Music System (1986) + 1986 + Island Logic + + + + + + + + + The Music System + 1984 + Island Logic + + + + + + + + + + + + + + + + + + + + + + Sport Spectacular + 198? + Alternative + + + + + + + + + + + + + + + + Mexico 86 + 1986 + Qualsoft + + + + + + + + + Not a Penny More, Not a Penny Less + 1987 + Domark + + + + + + + + + + + + + + + + Disc Duplicator II + 1984 + Howard Spurr + + + + + + + + + Star Seeker + 1985 + Mirrorsoft + + + + + + + + + Dunjunz + 1987 + Bug Byte + + + + + + + + + + + + + + + + Keyboard Player + 1986 + Chalksoft + + + + + + + + + Vector 2 v1.40 (Acorn 1770) + 1985 + Chalice Software + + + + + + + + + Vector 2 v1.40 (Single Density) + 1985 + Chalice Software + + + + + + + + + Vector 1 v1.20 + 1985 + Chalice Software + + + + + + + + + Vector 1 v1.20b + 1985 + Chalice Software + + + + + + + + + DOSCOPY + 1986 + Baksoft + + + + + + + + + Puff + 1986 + ESM + + + + + + + + + Space Shuttle + 1983 + Microdeal + + + + + + + + + DDD-calc + 1985 + Gemini + + + + + + + + + Olympic Decathlon + 1984 + Alligata + + + + + + + + + Egyptian Adventure + 1987 + Duckworth + + + + + + + + + Akhter BBC Disk Utilities + 198? + Akhter + + + + + + + + + Disc Duplicator 3 (modified to copy itself) + 1985 + FSoft + + + + + + + + + Disc Duplicator 3 + 1985 + FSoft + + + + + + + + + The Lord of the Rings + 1986 + Melbourne House + + + + + + + + + + + + + + + + Office Mate + 1986 + Watford Electronics + + + + + + + + + Office Master + 1986 + Gemini + + + + + + + + + The Hobbit + 1983 + Melbourne House + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mr T's Measuring Games + 1983 + Good Housekeeping Software + + + + + + + + + Clone + 1983 + <unknown> + + + + + + + + + Enthar Seven + 1985 + Robico + + + + + + + + + + + + + + + + Story + 1983 + H & H Software + + + + + + + + + Crosswords + 1986 + H.S.Software + + + + + + + + + Read-Right-Away + 1986 + H.S.Software + + + + + + + + + The Gold Collection + 1987 + U.S. Gold + + + + + + + + + + + + + + + + Bismarck Death of a Battleship + 1987 + BBC Soft + + + + + + + + + Steve Davis Snooker + 1986 + CDS + + + + + + + + + The Bug-Byte Compilation II + 1987 + Bug Byte + + + + + + + + + Replica II + 1983 + Clares + + + + + + + + + Replica III + 1985 + Clares + + + + + + + + + The Key + 1983 + Clares + + + + + + + + + Fun House + 1984 + Clares + + + + + + + + + Grafdisk + 1983 + Clares + + + + + + + + + Fontwise Plus + 198? + Clares + + + + + + + + + Fontwise Font Editor + 198? + Clares + + + + + + + + + Profile + 1985 + Clares + + + + + + + + + Beta-Base + 1983 + Clares + + + + + + + + + Beta-Base Utilities 1 + 198? + Clares + + + + + + + + + Klax + 1990 + Domark + + + + + + + + + Star Wars + 1987 + Domark + + + + + + + + + The Empire Strikes Back + 1988 + Domark + + + + + + + + + Return of the Jedi + 1988 + Domark + + + + + + + + + License to Kill + 1989 + Domark + + + + + + + + + The Living Daylights + 1983 + Domark + + + + + + + + + Holed Out + 1989 + 4th Dimension + + + + + + + + + White Magic 2 + 1989 + 4th Dimension + + + + + + + + + Nevyron + 1991 + 4th Dimension + + + + + + + + + U.I.M. + 1989 + 4th Dimension + + + + + + + + + E-Type + 1990 + 4th Dimension + + + + + + + + + White Magic + 1989 + 4th Dimension + + + + + + + + + Arcade Soccer + 1989 + 4th Dimension + + + + + + + + + Zenon + 1989 + Impact + + + + + + + + + Clogger + 1988 + Impact + + + + + + + + + Orbital + 1989 + Impact + + + + + + + + + The Art Studio + 1989 + Impact + + + + + + + + + Cheat It Again Joe Vol.1 + 1988 + Impact + + + + + + + + + Cheat It Again Joe Vol.2 + 1988 + Impact + + + + + + + + + Cheat It Again Joe Vol.4 + 1988 + Impact + + + + + + + + + Holed Out Extra Courses Vol.1 + 1990 + 4th Dimension + + + + + + + + + Holed Out Extra Courses Vol.2 + 1990 + 4th Dimension + + + + + + + + + Return to Eden + 1984 + Level 9 Computing + + + + + + + + + Colossal Adventure + 1983 + Level 9 Computing + + + + + + + + + Snowball + 1983 + Level 9 Computing + + + + + + + + + Lords of Time + 1983 + Level 9 Computing + + + + + + + + + Adventure Quest + 1983 + Level 9 Computing + + + + + + + + + Time and Magik - The Trilogy + 1988 + Mandarin + + + + + + + + + + + + + + + + Lancelot + 1988 + Mandarin + + + + + + + + + + + + + + + + Imogen + 1986 + Micro Power + + + + + + + + + Castle Quest + 1985 + Micro Power + + + + + + + + + Stock Car + 1983 + Micro Power + + + + + + + + + Cybertron Mission + 1984 + Micro Power + + + + + + + + + Dune Rider + 1984 + Micro Power + + + + + + + + + Intergalactic Trader + 1983 + Micro Power + + + + + + + + + Starfleet Encounter + 1984 + Micro Power + + + + + + + + + Doctor Who and the Mines of Terror (Master/B+) + 1986 + Micro Power + + + + + + + + + Doctor Who and the Mines of Terror (with ROM) + 1985 + Micro Power + + + + + + + + + + + + + + Blockbuster + 1984 + Micro Power + + + + + + + + + Mr Ee! + 1984 + Micro Power + + + + + + + + + Frenzy + 1983 + Micro Power + + + + + + + + + Killer Gorilla + 1984 + Micro Power + + + + + + + + + Ghouls + 1984 + Micro Power + + + + + + + + + The Mine + 1984 + Micro Power + + + + + + + + + Felix in the Factory + 1982 + Micro Power + + + + + + + + + Felix Meets the Evil Weevils + 1984 + Micro Power + + + + + + + + + Rubble Trouble + 1983 + Micro Power + + + + + + + + + Micro Power Magic + 1986 + Micro Power + + + + + + + + + + + + + + + + Micro Power Magic II + 1986 + Micro Power + + + + + + + + + + + + + + + + Micro Power Magic III + 1986 + Micro Power + + + + + + + + + + + + + + + + Repton + 1985 + Superior Software + + + + + + + + + Citadel + 1985 + Superior Software + + + + + + + + + Karate Combat + 1986 + Superior Software + + + + + + + + + Tempest + 1985 + Superior Software + + + + + + + + + Death Star + 1985 + Superior Software + + + + + + + + + Repton 2 + 1985 + Superior Software + + + + + + + + + Thrust + 1986 + Superior Software + + + + + + + + + Galaforce + 1986 + Superior Software + + + + + + + + + Stryker's Run + 1986 + Superior Software + + + + + + + + + Repton 3 + 1986 + Superior Software + + + + + + + + + Speech! + 1985 + Superior Software + + + + + + + + + Overdrive + 1984 + Superior Software + + + + + + + + + Froggy + 1982 + Superior Software + + + + + + + + + Exile (Version 1) + 1988 + Superior Software/Acornsoft + + + + + + + + + Exile (Version 2) + 1988 + Superior Software/Acornsoft + + + + + + + + + Exile (Version 3) + 1988 + Superior Software/Acornsoft + + + + + + + + + Exile (Review Copy) + 1988 + Superior Software/Acornsoft + + + + + + + + + + Ravenskull + 1987 + Superior Software/Acornsoft + + + + + + + + + Return to Doom + 1988 + Topologika + + + + + + + + + + + + + + + + Giant Killer + 1987 + Topologika + + + + + + + + + Countdown to Doom (Topologika) + 1987 + Topologika + + + + + + + + + Philosopher's Quest (Topologika) + 1987 + Topologika + + + + + + + + + Last Days of Doom + 1990 + Topologika + + + + + + + + + Acheton (Topologika) + 1987 + Topologika + + + + + + + + + Avon + 1989 + Topologika + + + + + + + + + Kingdom of Hamil (Topologika) + 1987 + Topologika + + + + + + + + + Murdac + 1989 + Topologika + + + + + + + + + Winter Olympiad 88 + 1988 + Tynesoft + + + + + + + + + Indoor Sports + 1988 + Tynesoft + + + + + + + + + Boulder Dash + 1988 + Tynesoft + + + + + + + + + Saigon + 1988 + Tynesoft + + + + + + + + + Summer Olympiad + 1988 + Tynesoft + + + + + + + + + Spy vs Spy + 1984 + Tynesoft + + + + + + + + + Circus Games + 1988 + Tynesoft + + + + + + + + + Phantom + 1987 + Tynesoft + + + + + + + + + Future Shock + 1986 + Tynesoft + + + + + + + + + Beverly Hills Cop + 1990 + Tynesoft + + + + + + + + + + + + + + + + + + + + + + + + + + + + Goal! + 1986 + Tynesoft + + + + + + + + + Commonwealth Games + 1986 + Tynesoft + + + + + + + + + + + + + + + + Winter Olympics + 1986 + Tynesoft + + + + + + + + + Superman: The Man of Steel + 1989 + Tynesoft + + + + + + + + + + + + + + + + Jet Set Willy II + 1985 + Tynesoft + + + + + + + + + + + Mailing System + 1984 + Acornsoft + + + + + + + + + + Database + 1983 + Acornsoft + + + + + + + + + + Accounts Receivable + 1984 + Acornsoft/MI + + + + + + + + + + Accounts Payable + 1984 + Acornsoft/MI + + + + + + + + + + Purchasing + 1984 + Acornsoft + + + + + + + + + + Invoicing + 1984 + Acornsoft + + + + + + + + + + FarmCash Setup v1.12 + 198? + Acornsoft + + + + + + + + + + FieldFile Setup v1.11 + 198? + Acornsoft + + + + + + + + + + CapCost Setup v1.11 + 1983 + Acornsoft + + + + + + + + + + FarmPlanner Setup v1.01 + 1983 + Acornsoft + + + + + + + + + + Mini Office + 1984 + Database + + + + + + + + + Mini Office II + 1986 + Database + + + + + + + + + + + Flowers of Crystal + 198? + 4mation + + + + + + + + + Dragon World (BBC Only) + 198? + 4mation + + + + + + + + + Dragon World + 198? + 4mation + + + + + + + + + Dinosaur Discovery + 198? + 4mation + + + + + + + + + World Without Words + 198? + 4mation + + + + + + + + + Box of Treasures Create + 198? + 4mation + + + + + + + + + Box of Treasures + 1983 + 4mation + + + + + + + + + Granny's Garden + 1984 + 4mation + + + + + + + + + + Children from Space + 1984 + Acornsoft/ASK + + + + + + + + + Hide & Seek + 1984 + Acornsoft/ASK + + + + + + + + + Facemaker + 1984 + Acornsoft/ASK + + + + + + + + + Squeeze + 1984 + Acornsoft/ASK + + + + + + + + + Number Gulper + 1984 + Acornsoft/ASK + + + + + + + + + Cranky + 1984 + Acornsoft/ASK + + + + + + + + + Table Adventures + 1984 + Acornsoft/ASK + + + + + + + + + Juggle Puzzle + 1984 + Acornsoft/ASK + + + + + + + + + Pazazz + 1985 + ASK + + + + + + + + + Let's Count + 1984 + Acornsoft/ASK + + + + + + + + + Words Words Words + 1984 + Acornsoft/ASK + + + + + + + + + Podd + 1984 + Acornsoft/ASK + + + + + + + + + Timeman One + 1983 + Bourne Educational Software + + + + + + + + + Happy Numbers + 198? + Bourne Educational Software + + + + + + + + + Fun School 2 (For 6-8 year olds) + 1989 + Database Educational Software + + + + + + + + + Fun School 2 (For the Over-8s) + 1989 + Database Educational Software + + + + + + + + + Symbols to Moles + 198? + Five Ways Software + + + + + + + + + Longitudinal Waves + 198? + Five Ways Software + + + + + + + + + Bert Boot + 1984 + H.S.Software + + + + + + + + + Roadcraft 1 + 1984 + H.S.Software + + + + + + + + + The French Mistress Level A + 1983 + Kosmos + + + + + + + + + The French Mistress Level B + 1983 + Kosmos + + + + + + + + + The Teddy Bears' Picnic + 1989 + Sherston Software + + + + + + + + + + + + + + + + Connections + 1990 + Sherston Software + + + + + + + + + Short Vowel Sounds v2 + 1983 + Sherston Software + + + + + + + + + Short Vowel Sounds + 1983 + Sherston Software + + + + + + + + + The Circus + 1985 + Sherston Software + + + + + + + + + + + + + + + + Maths Snap + 198? + Sherston Software + + + + + + + + + Word Builder MkII + 1985 + Sherston Software + + + + + + + + + Word Builder MkII (alt) + 1985 + Sherston Software + + + + + + + + + Word Builder + 198? + Sherston Software + + + + + + + + + Tens and Units + 1985 + Sherston Software + + + + + + + + + Graph Builder + 1986 + Sherston Software + + + + + + + + + Graph Builder (alt) + 1986 + Sherston Software + + + + + + + + + The Wizard's Return (alt) + 1989 + Sherston Software + + + + + + + + + + + + + + + + The Wizard's Return + 1985 + Sherston Software + + + + + + + + + + + + + + + + Understanding Area (alt) + 1986 + Sherston Software + + + + + + + + + Understanding Area + 1986 + Sherston Software + + + + + + + + + Dream Time + 1989 + Sherston Software + + + + + + + + + + + + + + + + The Teachers Cupboard + 198? + Sherston Software + + + + + + + + + + + + + + + + Easy Type + 1984 + Sherston Software + + + + + + + + + Magic E + 198? + Sherston Software + + + + + + + + + Story Starts + 198? + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Wizard's Revenge + 1989 + Sherston Software + + + + + + + + + + + + + + + + Zillion + 1990 + Sherston Software + + + + + + + + + + + + + + + + + + + + + + Animal Rescue + 1986 + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Nature Park Adventure + 1987 + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Nature Park Adventure (alt) + 1987 + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + Toby at the Beach + 1990 + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Animated Alphabet + 198? + Sherston Software + + + + + + + + + + + + + + + + Selladore Tales + 1991 + Sherston Software + + + + + + + + + + + + + + + + The Farm + 1987 + Sherston Software + + + + + + + + + + + + + + + + Mr Yog and the Nippet + 1984 + Sherston Software + + + + + + + + + Mapventure + 1988 + Sherston Software + + + + + + + + + + + + + + + + Animated Numbers + 198? + Sherston Software + + + + + + + + + Typesetter! + 198? + Sherston Software + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ollie Octopus' Sketchpad + 1983 + Storm Software + + + + + + + + + The Grammar Tree - Verbs & Adverbs + 1983 + Sulis Software + + + + + + + + + The Grammar Tree - Sentences + 1983 + Sulis Software + + + + + + + + + The Grammar Tree - Nouns & Adjectives + 1983 + Sulis Software + + + + + + + + + Time Traveller + 1983 + Sulis Software + + + + + + + + diff --git a/hash/bbcm_cass.xml b/hash/bbcm_cass.xml index ec20ec269db..8ba9f2f5222 100644 --- a/hash/bbcm_cass.xml +++ b/hash/bbcm_cass.xml @@ -62,14 +62,16 @@ Welcome - 198? + 1986 BBC Soft + + -- cgit v1.2.3-70-g09d2 From 5d004af6c92344b8a8f007b695f0203e6414e168 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sun, 15 Nov 2015 02:38:06 +0000 Subject: bbc: preliminary support for FSD format. --- scripts/src/lib.lua | 2 + src/lib/formats/fsd_dsk.cpp | 180 ++++++++++++++++++++++++++++++++++++++++++++ src/lib/formats/fsd_dsk.h | 43 +++++++++++ src/mame/drivers/bbc.cpp | 24 +++--- 4 files changed, 237 insertions(+), 12 deletions(-) create mode 100644 src/lib/formats/fsd_dsk.cpp create mode 100644 src/lib/formats/fsd_dsk.h diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 2aa11eb0fd2..a567514f9c0 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -261,6 +261,8 @@ project "formats" MAME_DIR .. "src/lib/formats/fmsx_cas.h", MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp", MAME_DIR .. "src/lib/formats/fmtowns_dsk.h", + MAME_DIR .. "src/lib/formats/fsd_dsk.cpp", + MAME_DIR .. "src/lib/formats/fsd_dsk.h", MAME_DIR .. "src/lib/formats/g64_dsk.cpp", MAME_DIR .. "src/lib/formats/g64_dsk.h", MAME_DIR .. "src/lib/formats/gtp_cas.cpp", diff --git a/src/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp new file mode 100644 index 00000000000..c5820c7ef66 --- /dev/null +++ b/src/lib/formats/fsd_dsk.cpp @@ -0,0 +1,180 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/*************************************************************************** + + BBC Micro 8271 protected disk image format + + Disk image format + +***************************************************************************/ + +#include "emu.h" +#include "fsd_dsk.h" + + +/********************************************************************* + + BBC Micro 8271 protected disk image format + + Header: + ======= + Identifier: "FSD" string literal 3 bytes + Creator: 5 bytes; date of creation/author + Title: Character string (unlimited length; may contain any but null) + Title_End: 0x00 byte literal 1 byte + Num_Tr: xx 1 byte, number of tracks + + For each track + ============== + track_num: 1 byte + num_sec: 1 byte (00 == unformatted) + readable: 1 byte (00 == unreadable, ff ==readable) + + If readable: + For each sector + =============== + Track_ID: 1 byte + Head_number: 1 byte + Sector_ID: 1 byte + reported_size: 1 byte (2^{7+x}; 0 ==>128, 1 ==> 256, 2==>512, 3==>1024 etc) + real_size: 1 byte (2^{7+x}) + error_code: 1 byte (0==No Error, &20==Deleted Data; &0E = Data CRC Error) + data: bytes + Note that error_code matches the OSWORD &7F result byte + + If unreadable: + Track_ID: 1 byte + Head_number: 1 byte + Sector_ID: 1 byte + reported_size: 1 byte + + Decoding of the "creator" 5 byte field: + ======================================= + (byte1 byte2 byte3 byte4 byte5) + + Date_DD = (byte1 AND &F8)/8 + Date_MM = (byte3 AND &0F) + Date_YYYY = (byte1 AND &07)*256+byte2 + Creator_ID = (byte3 AND &F0)/16 + Release_num = ((byte5 AND &C0)/64)*256 + byte4 + +*********************************************************************/ + +fsd_format::fsd_format() +{ +} + +const char *fsd_format::name() const +{ + return "fsd"; +} + +const char *fsd_format::description() const +{ + return "BBC Micro 8271 protected disk image"; +} + +const char *fsd_format::extensions() const +{ + return "fsd"; +} + +bool fsd_format::supports_save() const +{ + return false; +} + +int fsd_format::identify(io_generic *io, UINT32 form_factor) +{ + UINT8 h[3]; + + io_generic_read(io, h, 0, 3); + if (memcmp(h, "FSD", 3) == 0) { + return 100; + } + return 0; +} + +bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) +{ + UINT64 size = io_generic_size(io); + dynamic_buffer img(size); + io_generic_read(io, &img[0], 0, size); + + UINT64 pos; + std::string title; + for(pos=8; pos < size && img[pos] != NULL; pos++) + title += char(img[pos]); + pos++; + + if(pos >= size) + return false; + + //popmessage("Loading image of '%s'\n", title); + + desc_pc_sector sects[10]; + UINT8 total_tracks = img[pos++]; + UINT8 tnum, hnum, snum, ssize, error; + + hnum = 0; + //osd_printf_verbose("%d Tracks\n", total_tracks+1); + //osd_printf_verbose("Tr.# No.S Sec.# Tr.ID Head# SecID IDsiz REsiz Error\n"); + for(int curr_track=0; curr_track <= total_tracks; curr_track++) + { + UINT8 track = img[pos++]; + UINT8 spt = img[pos++]; + //osd_printf_verbose("%x %x\n", track, spt); + if (spt > 0) // formatted + { + UINT8 readable = img[pos++]; + for (int i = 0; i < spt; i++) + { + tnum = img[pos++]; // logical track + hnum = img[pos++]; // head number + snum = img[pos++]; // logical sector + ssize = img[pos++]; // reported size + sects[i].track = tnum; + sects[i].head = hnum; + sects[i].sector = snum; + sects[i].size = ssize; + if (readable == 0xff) + { + sects[i].actual_size = 1 << (img[pos++] + 7); + error = img[pos++]; + sects[i].deleted = (error & 0x20) == 0x20; + sects[i].bad_crc = (error & 0x0e) == 0x0e; + sects[i].data = &img[pos]; + pos += sects[i].actual_size; + //osd_printf_verbose("Read %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, error); + } + else + { + throw emu_fatalerror("fsd_format: Unsupported unreadable sector on track %d sector %d head %d", track, i, hnum); + + // Unreadable sectors not supported!! + //sects[i].track = track; + //sects[i].head = 0; + //sects[i].sector = i; + //sects[i].size = 0; + //sects[i].actual_size = 0; + //sects[i].deleted = false; + //sects[i].bad_crc = false; + //sects[i].data = NULL; + //osd_printf_verbose("Unread %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, 0); + } + } + } + else // unformatted + { + sects[0].track = curr_track; + sects[0].head = hnum; + sects[0].sector = 0; + sects[0].size = 0; + //osd_printf_verbose("Unform %x %x %x %x %x %x %x\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, 0); + } + build_wd_track_fm(curr_track, hnum, image, 50000, spt, sects, 10, 40, 10); + } + return true; +} + +const floppy_format_type FLOPPY_FSD_FORMAT = &floppy_image_format_creator; diff --git a/src/lib/formats/fsd_dsk.h b/src/lib/formats/fsd_dsk.h new file mode 100644 index 00000000000..8d7a9302926 --- /dev/null +++ b/src/lib/formats/fsd_dsk.h @@ -0,0 +1,43 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/*************************************************************************** + + BBC Micro + + Disk image formats + +***************************************************************************/ + +#pragma once + +#ifndef __FSD_DSK_H__ +#define __FSD_DSK_H__ + +#include "flopimg.h" +#include "wd177x_dsk.h" + +/**************************************************************************/ + +LEGACY_FLOPPY_OPTIONS_EXTERN(fsd); + +/**************************************************************************/ + + + +class fsd_format : public floppy_image_format_t +{ +public: + fsd_format(); + + virtual const char *name() const; + virtual const char *description() const; + virtual const char *extensions() const; + virtual bool supports_save() const; + + virtual int identify(io_generic *io, UINT32 form_factor); + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); +}; + +extern const floppy_format_type FLOPPY_FSD_FORMAT; + +#endif // __FSD_DSK_H__ diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index ef1d8aa5446..6628df09465 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -55,7 +55,7 @@ /* Devices */ #include "imagedev/flopdrv.h" #include "formats/bbc_dsk.h" -//#include "formats/fsd_dsk.h" +#include "formats/fsd_dsk.h" #include "imagedev/cassette.h" #include "formats/uef_cas.h" #include "formats/csw_cas.h" @@ -683,16 +683,16 @@ WRITE_LINE_MEMBER(bbc_state::bbcb_acia6850_irq_w) FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbc ) FLOPPY_BBC_DFS_FORMAT, - FLOPPY_BBC_CPM_FORMAT - //FLOPPY_FSD_FORMAT + FLOPPY_BBC_CPM_FORMAT, + FLOPPY_FSD_FORMAT FLOPPY_FORMATS_END FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbcm ) FLOPPY_BBC_DFS_FORMAT, FLOPPY_BBC_ADFS_FORMAT, FLOPPY_BBC_CPM_FORMAT, - FLOPPY_BBC_DOS_FORMAT - //FLOPPY_FSD_FORMAT + FLOPPY_BBC_DOS_FORMAT, + FLOPPY_FSD_FORMAT FLOPPY_FORMATS_END FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbcmc ) @@ -882,7 +882,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass") MCFG_SOFTWARE_LIST_ADD("flop_ls_b", "bbcb_flop") - //MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop") MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_z80_flop") MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_32016_flop") MACHINE_CONFIG_END @@ -978,7 +978,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") - //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MACHINE_CONFIG_END @@ -999,7 +999,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") - //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MACHINE_CONFIG_END @@ -1051,7 +1051,7 @@ static MACHINE_CONFIG_DERIVED( reutapm, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a") MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") - //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MACHINE_CONFIG_END @@ -1140,7 +1140,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b", "bbcb_flop") - //MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop") /* acia */ MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) @@ -1230,7 +1230,7 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") - //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") @@ -1301,7 +1301,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b") - //MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("cart_ls_m") -- cgit v1.2.3-70-g09d2 From de7c9eab24b41a12f019d3f9f0f13cbbc4f586ec Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sun, 15 Nov 2015 03:05:32 +0000 Subject: null is \0 (nw) --- src/lib/formats/fsd_dsk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp index c5820c7ef66..bed5a780275 100644 --- a/src/lib/formats/fsd_dsk.cpp +++ b/src/lib/formats/fsd_dsk.cpp @@ -103,7 +103,7 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT64 pos; std::string title; - for(pos=8; pos < size && img[pos] != NULL; pos++) + for(pos=8; pos < size && img[pos] != '\0'; pos++) title += char(img[pos]); pos++; -- cgit v1.2.3-70-g09d2 From 1fe2587c86ff2c8e77ae457a8bdd02e1e385d93f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 15 Nov 2015 12:20:35 +0100 Subject: This one is not used in compile (nw) --- scripts/src/cpu.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 1642b6d23b7..dc2eb538b00 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -1895,7 +1895,6 @@ if (CPUS["TMS9900"]~=null) then MAME_DIR .. "src/devices/cpu/tms9900/tms9995.h", MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.cpp", MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.h", - MAME_DIR .. "src/devices/cpu/tms9900/99xxcore.h", MAME_DIR .. "src/devices/cpu/tms9900/tms99com.h", } end -- cgit v1.2.3-70-g09d2 From 225a99c0f6cfc60bb8f61fbc00dce92bdfb7b79a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 15 Nov 2015 15:14:55 +0100 Subject: Add definitions to cmake target (nw) --- 3rdparty/genie/src/actions/cmake/cmake_project.lua | 5 +++++ 3rdparty/genie/src/host/scripts.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/3rdparty/genie/src/actions/cmake/cmake_project.lua b/3rdparty/genie/src/actions/cmake/cmake_project.lua index dc305930cd8..b98a20c65a8 100644 --- a/3rdparty/genie/src/actions/cmake/cmake_project.lua +++ b/3rdparty/genie/src/actions/cmake/cmake_project.lua @@ -42,7 +42,12 @@ function premake.cmake.project(prj) for _,v in ipairs(cfg.includedirs) do _p('include_directories(../%s)', premake.esc(v)) end + for _,v in ipairs(cfg.defines) do + _p('add_definitions(-D%s)', premake.esc(v)) + end + break end + break end if (prj.kind=='StaticLib') then diff --git a/3rdparty/genie/src/host/scripts.c b/3rdparty/genie/src/host/scripts.c index 9f74e7911e5..e00252112fa 100644 --- a/3rdparty/genie/src/host/scripts.c +++ b/3rdparty/genie/src/host/scripts.c @@ -176,8 +176,8 @@ const char* builtin_scripts[] = { "function premake.cmake.workspace(sln)\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\nfor i,prj in ipairs(sln.projects) do\nlocal name = premake.esc(prj.name)\n_p('add_subdirectory(%s)', name)\nend\nend\n", /* actions/cmake/cmake_project.lua */ - "local cmake = premake.cmake\nlocal tree = premake.tree\nfunction cmake.files(prj)\nlocal tr = premake.project.buildsourcetree(prj)\ntree.traverse(tr, {\nonbranchenter = function(node, depth)\nend,\nonbranchexit = function(node, depth)\nend,\nonleaf = function(node, depth)\n_p(1, '../%s', node.cfg.name)\nend,\n}, true, 1)\nend\nfunction premake.cmake.project(prj)\nio.indent = \" \"\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\n_p('project(%s)', premake.esc(prj.name))\n_p('set(')\n_p('source_list')\ncmake.files(prj)\n_p(')')\nlocal platforms = premake.filterplatforms(prj.solution, premake[_OPTIONS.cc].platforms, \"Native\")\nfor i = #platforms, 1, -1 do\nif premake.platforms[platforms[i]].iscrosscompiler then\ntable.remove(platforms, i)\nend\nend \nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\nfor _,v in ipairs(cfg.includedirs) do\n_p('include_directories(../%s)', premake.esc(v))\nend\nend\nend\nif (prj.kind=='StaticLib') then\n_p('add_library(%s STATIC ${sour" - "ce_list})',premake.esc(prj.name))\nend\nif (prj.kind=='SharedLib') then\n_p('add_library(%s SHARED ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='ConsoleApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='WindowedApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nend\n", + "local cmake = premake.cmake\nlocal tree = premake.tree\nfunction cmake.files(prj)\nlocal tr = premake.project.buildsourcetree(prj)\ntree.traverse(tr, {\nonbranchenter = function(node, depth)\nend,\nonbranchexit = function(node, depth)\nend,\nonleaf = function(node, depth)\n_p(1, '../%s', node.cfg.name)\nend,\n}, true, 1)\nend\nfunction premake.cmake.project(prj)\nio.indent = \" \"\n_p('cmake_minimum_required(VERSION 2.8.4)')\n_p('')\n_p('project(%s)', premake.esc(prj.name))\n_p('set(')\n_p('source_list')\ncmake.files(prj)\n_p(')')\nlocal platforms = premake.filterplatforms(prj.solution, premake[_OPTIONS.cc].platforms, \"Native\")\nfor i = #platforms, 1, -1 do\nif premake.platforms[platforms[i]].iscrosscompiler then\ntable.remove(platforms, i)\nend\nend \nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\nfor _,v in ipairs(cfg.includedirs) do\n_p('include_directories(../%s)', premake.esc(v))\nend\nfor _,v in ipairs(cfg.defines) do\n_p('add_definitions(-D%s)', premake.esc(" + "v))\nend\nbreak\nend\nbreak\nend\nif (prj.kind=='StaticLib') then\n_p('add_library(%s STATIC ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='SharedLib') then\n_p('add_library(%s SHARED ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='ConsoleApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nif (prj.kind=='WindowedApp') then\n_p('add_executable(%s ${source_list})',premake.esc(prj.name))\nend\nend\n", /* actions/make/_make.lua */ "_MAKE = { }\npremake.make = { }\nlocal make = premake.make\nfunction _MAKE.esc(value)\nlocal result\nif (type(value) == \"table\") then\nresult = { }\nfor _,v in ipairs(value) do\ntable.insert(result, _MAKE.esc(v))\nend\nreturn result\nelse\nresult = value:gsub(\"\\\\\", \"\\\\\\\\\")\nresult = result:gsub(\" \", \"\\\\ \")\nresult = result:gsub(\"%%(\", \"\\\\%(\")\nresult = result:gsub(\"%%)\", \"\\\\%)\")\nresult = result:gsub(\"$\\\\%((.-)\\\\%)\", \"$%(%1%)\")\nreturn result\nend\nend\nfunction premake.make_copyrule(source, target)\n_p('%s: %s', target, source)\n_p('\\t@echo Copying $(notdir %s)', target)\n_p('\\t-$(call COPY,%s,%s)', source, target)\nend\nfunction premake.make_mkdirrule(var)\n_p('\\t@echo Creating %s', var)\n_p('\\t-$(call MKDIR,%s)', var)\n_p('')\nend\nfunction make.list(value)\nif #value > 0 then\nreturn \" \" .. table.concat(value, \" \")\nelse\nreturn \"\"\nend\nend\nfunction _MAKE.getmakefilename(this, searchprjs)\nlocal count = 0\nfor sln in premake.solution.each() do\nif (sln.loca" -- cgit v1.2.3-70-g09d2 From febf57a3bdfdfd6efcf8dc97f176e7b1d71d62e1 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sun, 15 Nov 2015 14:35:03 +0000 Subject: fixed softlists validity (nw) --- hash/bbc_32016_flop.xml | 28 ++-- hash/bbc_68000_flop.xml | 6 +- hash/bbc_80186_flop.xml | 34 ++--- hash/bbc_arm_flop.xml | 12 +- hash/bbc_z80_flop.xml | 38 ++--- hash/bbca_cass.xml | 16 +-- hash/bbcb_cass.xml | 376 ++++++++++++++++++++++++------------------------ hash/bbcb_orig_flop.xml | 208 +++++++++++++-------------- hash/bbcm_cass.xml | 4 +- 9 files changed, 361 insertions(+), 361 deletions(-) diff --git a/hash/bbc_32016_flop.xml b/hash/bbc_32016_flop.xml index 454d6616c87..f7c354aab39 100644 --- a/hash/bbc_32016_flop.xml +++ b/hash/bbc_32016_flop.xml @@ -17,43 +17,43 @@ - + - + - + - + - + - + - + @@ -67,43 +67,43 @@ - + - + - + - + - + - + - + diff --git a/hash/bbc_68000_flop.xml b/hash/bbc_68000_flop.xml index 8f4c7b3407c..0f5a23c557b 100644 --- a/hash/bbc_68000_flop.xml +++ b/hash/bbc_68000_flop.xml @@ -17,19 +17,19 @@ - + - + - + diff --git a/hash/bbc_80186_flop.xml b/hash/bbc_80186_flop.xml index 55021a08a47..5e3fcae4e83 100644 --- a/hash/bbc_80186_flop.xml +++ b/hash/bbc_80186_flop.xml @@ -17,37 +17,37 @@ - + - + - + - + - + - + @@ -61,31 +61,31 @@ - + - + - + - + - + @@ -99,37 +99,37 @@ - + - + - + - + - + - + diff --git a/hash/bbc_arm_flop.xml b/hash/bbc_arm_flop.xml index 4e62f65f670..691ed53f12e 100644 --- a/hash/bbc_arm_flop.xml +++ b/hash/bbc_arm_flop.xml @@ -17,37 +17,37 @@ - + - + - + - + - + - + diff --git a/hash/bbc_z80_flop.xml b/hash/bbc_z80_flop.xml index c9030b24eb6..548ed9bfdd8 100644 --- a/hash/bbc_z80_flop.xml +++ b/hash/bbc_z80_flop.xml @@ -18,43 +18,43 @@ - + - + - + - + - + - + - + @@ -68,73 +68,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/hash/bbca_cass.xml b/hash/bbca_cass.xml index 0ca9c057696..2b401ad8833 100644 --- a/hash/bbca_cass.xml +++ b/hash/bbca_cass.xml @@ -78,13 +78,13 @@ Acornsoft - + - + @@ -96,37 +96,37 @@ 1982 I.J.K. - + - + - + - + - + - + diff --git a/hash/bbcb_cass.xml b/hash/bbcb_cass.xml index c5fb7f8197a..0d498bcbc81 100644 --- a/hash/bbcb_cass.xml +++ b/hash/bbcb_cass.xml @@ -235,13 +235,13 @@ 1983 Doctor Soft - + - + @@ -621,25 +621,25 @@ 1986 Riverdale - + - + - + - + @@ -673,13 +673,13 @@ 19?? Lee - + - + @@ -769,13 +769,13 @@ 1983 Software Invasion - + - + @@ -1034,25 +1034,25 @@ 1987 Elk Adventure Club - + - + - + - + @@ -1163,13 +1163,13 @@ 1987 Superior Software - + - + @@ -1770,25 +1770,25 @@ 19?? J Keyne - + - + - + - + @@ -2046,13 +2046,13 @@ 1984 MRM Software - + - + @@ -2670,43 +2670,43 @@ 198? CDS - + - + - + - + - + - + - + @@ -2961,13 +2961,13 @@ 19?? Selec - + - + @@ -3160,13 +3160,13 @@ 198? Cumana - + - + @@ -3244,13 +3244,13 @@ 198? Ocean - + - + @@ -3418,13 +3418,13 @@ Voltmace - + - + @@ -3448,13 +3448,13 @@ Visions - + - + @@ -5075,25 +5075,25 @@ 1983 Salamander - + - + - + - + @@ -5105,19 +5105,19 @@ 1983 Salamander - + - + - + @@ -5264,13 +5264,13 @@ 1983 MGB Software - + - + @@ -5404,13 +5404,13 @@ 1986 Incentive - + - + @@ -6100,13 +6100,13 @@ 1988 Mandarin - + - + @@ -6284,13 +6284,13 @@ 198? Lee - + - + @@ -6417,13 +6417,13 @@ 198? Central Computing - + - + @@ -7237,13 +7237,13 @@ 1985 Mirrorsoft - + - + @@ -7288,25 +7288,25 @@ 1986 Melbourne House - + - + - + - + @@ -7430,19 +7430,19 @@ 1987 Elk Adventure Club - + - + - + @@ -7711,13 +7711,13 @@ 1986 Qualsoft - + - + @@ -8109,13 +8109,13 @@ 198? Slippery Slug - + - + @@ -8237,13 +8237,13 @@ 198? Hybrid - + - + @@ -8255,7 +8255,7 @@ 19?? GTM - + @@ -8272,13 +8272,13 @@ 19?? Duckworth - + - + @@ -8389,13 +8389,13 @@ 19?? Central Computing - + - + @@ -9048,13 +9048,13 @@ 1989 Superior Software - + - + @@ -9745,13 +9745,13 @@ 1987 Elk Adventure Club - + - + @@ -9963,19 +9963,19 @@ 1986 Robico - + - + - + @@ -10032,13 +10032,13 @@ Larsoft - + - + @@ -10176,25 +10176,25 @@ Elk Adventure Club - + - + - + - + @@ -10360,13 +10360,13 @@ 1984 Triffid Software - + - + @@ -10378,7 +10378,7 @@ 1984 Triffid Software - + @@ -11128,19 +11128,19 @@ 198? Qualsoft - + - + - + @@ -11435,13 +11435,13 @@ 198? Sullis - + - + @@ -11553,13 +11553,13 @@ 1990 CDS - + - + @@ -11571,13 +11571,13 @@ 1988 Alternative - + - + @@ -11833,19 +11833,19 @@ 1987 Elk Adventure Club - + - + - + @@ -12068,13 +12068,13 @@ 19?? Central Computing - + - + @@ -12087,13 +12087,13 @@ 19?? Central Computing - + - + @@ -12171,25 +12171,25 @@ 1986 Riverdale - + - + - + - + @@ -12580,13 +12580,13 @@ 198? CRL - + - + @@ -12598,13 +12598,13 @@ 198? CRL - + - + @@ -12672,13 +12672,13 @@ 1989 Impact - + - + @@ -12745,19 +12745,19 @@ 1988 DW Gore - + - + - + @@ -12780,13 +12780,13 @@ 198? Quicksilva - + - + @@ -13145,25 +13145,25 @@ 1983 Gemini - + - + - + - + @@ -13242,19 +13242,19 @@ 1988 Alternative - + - + - + @@ -13266,19 +13266,19 @@ 1988 Alternative - + - + - + @@ -13290,19 +13290,19 @@ 1988 Alternative - + - + - + @@ -13314,19 +13314,19 @@ 1988 Alternative - + - + - + @@ -13338,19 +13338,19 @@ 1988 Alternative - + - + - + @@ -13362,19 +13362,19 @@ 1988 Alternative - + - + - + @@ -13386,19 +13386,19 @@ 1988 Alternative - + - + - + @@ -13410,19 +13410,19 @@ 1988 Alternative - + - + - + @@ -13434,19 +13434,19 @@ 1988 Alternative - + - + - + @@ -13549,25 +13549,25 @@ 19?? David McKeran - + - + - + - + @@ -14647,13 +14647,13 @@ 198? Glentop - + - + @@ -14665,13 +14665,13 @@ 198? Addison-Wesley - + - + @@ -14694,25 +14694,25 @@ 1985 ASK - + - + - + - + @@ -14746,13 +14746,13 @@ 198? Macmillian - + - + @@ -14811,13 +14811,13 @@ 1985 Mirrorsoft - + - + @@ -14950,13 +14950,13 @@ 198? Chalksoft - + - + @@ -15343,13 +15343,13 @@ 198? Macmillian - + - + @@ -15499,13 +15499,13 @@ 198? Macmillian - + - + @@ -15554,25 +15554,25 @@ 198? Macmillian - + - + - + - + @@ -15584,13 +15584,13 @@ 198? Advanced Memory Systems - + - + @@ -15602,13 +15602,13 @@ 198? Screenplay - + - + @@ -15709,13 +15709,13 @@ 1984 Addison-Wesley - + - + @@ -15776,13 +15776,13 @@ Acornsoft - + - + diff --git a/hash/bbcb_orig_flop.xml b/hash/bbcb_orig_flop.xml index 38ab4b488a4..5140a056ce5 100644 --- a/hash/bbcb_orig_flop.xml +++ b/hash/bbcb_orig_flop.xml @@ -262,13 +262,13 @@ Acornsoft - + - + @@ -760,13 +760,13 @@ 1990 Audiogenic - + - + @@ -778,13 +778,13 @@ 1987 Audiogenic - + - + @@ -829,13 +829,13 @@ 1988 CDS - + - + @@ -1518,13 +1518,13 @@ 1985 Glentop Publishers - + - + @@ -1613,13 +1613,13 @@ 1988 The Times - + - + @@ -1686,19 +1686,19 @@ 1984 Island Logic - + - + - + @@ -1710,13 +1710,13 @@ 198? Alternative - + - + @@ -1739,13 +1739,13 @@ 1987 Domark - + - + @@ -1779,13 +1779,13 @@ 1987 Bug Byte - + - + @@ -1951,13 +1951,13 @@ 1986 Melbourne House - + - + @@ -1991,31 +1991,31 @@ 1983 Melbourne House - + - + - + - + - + @@ -2049,13 +2049,13 @@ 1985 Robico - + - + @@ -2100,13 +2100,13 @@ 1987 U.S. Gold - + - + @@ -2558,13 +2558,13 @@ 1988 Mandarin - + - - + + @@ -2576,13 +2576,13 @@ 1988 Mandarin - + - + @@ -2797,13 +2797,13 @@ 1986 Micro Power - + - + @@ -2815,13 +2815,13 @@ 1986 Micro Power - + - + @@ -2833,13 +2833,13 @@ 1986 Micro Power - + - + @@ -3050,13 +3050,13 @@ 1988 Topologika - + - + @@ -3255,25 +3255,25 @@ 1990 Tynesoft - + - + - + - + @@ -3296,13 +3296,13 @@ 1986 Tynesoft - + - + @@ -3325,13 +3325,13 @@ 1989 Tynesoft - + - + @@ -3584,7 +3584,7 @@ - + Children from Space 1984 Acornsoft/ASK @@ -3831,13 +3831,13 @@ 1989 Sherston Software - + - + @@ -3882,13 +3882,13 @@ 1985 Sherston Software - + - + @@ -3977,13 +3977,13 @@ 1989 Sherston Software - + - + @@ -3995,13 +3995,13 @@ 1985 Sherston Software - + - + @@ -4035,13 +4035,13 @@ 1989 Sherston Software - + - + @@ -4053,13 +4053,13 @@ 198? Sherston Software - + - + @@ -4093,25 +4093,25 @@ 198? Sherston Software - + - + - + - + @@ -4123,13 +4123,13 @@ 1989 Sherston Software - + - + @@ -4141,19 +4141,19 @@ 1990 Sherston Software - + - + - + @@ -4165,25 +4165,25 @@ 1986 Sherston Software - + - + - + - + @@ -4195,25 +4195,25 @@ 1987 Sherston Software - + - + - + - + @@ -4225,25 +4225,25 @@ 1987 Sherston Software - + - + - + - + @@ -4255,25 +4255,25 @@ 1990 Sherston Software - + - + - + - + @@ -4285,31 +4285,31 @@ 198? Sherston Software - + - + - + Selladore Tales 1991 Sherston Software - + - + @@ -4321,13 +4321,13 @@ 1987 Sherston Software - + - + @@ -4350,13 +4350,13 @@ 1988 Sherston Software - + - + @@ -4379,25 +4379,25 @@ 198? Sherston Software - + - + - + - + diff --git a/hash/bbcm_cass.xml b/hash/bbcm_cass.xml index 8ba9f2f5222..67b5cfc2992 100644 --- a/hash/bbcm_cass.xml +++ b/hash/bbcm_cass.xml @@ -65,13 +65,13 @@ 1986 BBC Soft - + - + -- cgit v1.2.3-70-g09d2 From 7114c572c95c9da302ad4d2bd2cf814475013d56 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 15 Nov 2015 10:42:21 -0500 Subject: namcos23: improved downhill digital inputs (nw) --- src/mame/drivers/namcos23.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index c7d3e78d405..31597971aee 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -3377,7 +3377,53 @@ static INPUT_PORTS_START( timecrs2 ) INPUT_PORTS_END +static INPUT_PORTS_START( downhill ) + PORT_START("P1") + PORT_BIT( 0xfff, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("P2") + PORT_BIT( 0xfff, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("IN01") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // brake left + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_START1) // start + PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_SERVICE) PORT_TOGGLE // test switch + PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) // select up + PORT_BIT(0x400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) // select down + PORT_BIT(0x800, IP_ACTIVE_LOW, IPT_BUTTON1) // enter + PORT_BIT(0xf00c, IP_ACTIVE_LOW, IPT_UNKNOWN) + + PORT_START("IN23") + PORT_BIT(0x400, IP_ACTIVE_LOW, IPT_BUTTON4) // brake right + PORT_BIT(0xfbff, IP_ACTIVE_LOW, IPT_UNKNOWN) + PORT_START("SERVICE") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service coin + + PORT_START("DSW") + PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) + PORT_DIPNAME( 0x02, 0x02, "Skip POST" ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, "Freeze?" ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) +INPUT_PORTS_END /*************************************************************************** @@ -5081,7 +5127,7 @@ GAME( 1997, rapidrvr, 0, gorgon, rapidrvr, namcos23_state, s23, GAME( 1997, rapidrvrv2c, rapidrvr, gorgon, rapidrvr, namcos23_state, s23, ROT0, "Namco", "Rapid River (RD2 Ver. C)", GAME_FLAGS ) // 97/11/27, Europe GAME( 1997, rapidrvrp, rapidrvr, gorgon, rapidrvrp, namcos23_state, s23, ROT0, "Namco", "Rapid River (prototype)", GAME_FLAGS ) // 97/11/10, USA GAME( 1997, finfurl, 0, gorgon, finfurl, namcos23_state, s23, ROT0, "Namco", "Final Furlong (FF2 Ver. A)", GAME_FLAGS ) -GAME( 1997, downhill, 0, s23, s23, namcos23_state, s23, ROT0, "Namco", "Downhill Bikers (DH3 Ver. A)", GAME_FLAGS ) +GAME( 1997, downhill, 0, s23, downhill, namcos23_state, s23, ROT0, "Namco", "Downhill Bikers (DH3 Ver. A)", GAME_FLAGS ) GAME( 1997, motoxgo, 0, s23, s23, namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG3 Ver. A)", GAME_FLAGS ) GAME( 1997, motoxgov2a, motoxgo, s23, s23, namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG2 Ver. A)", GAME_FLAGS ) GAME( 1997, motoxgov1a, motoxgo, s23, s23, namcos23_state, s23, ROT0, "Namco", "Motocross Go! (MG1 Ver. A, set 1)", GAME_FLAGS ) -- cgit v1.2.3-70-g09d2 From 79140d63652e2852929b01648a9f39384f866d48 Mon Sep 17 00:00:00 2001 From: einstein95 Date: Mon, 16 Nov 2015 06:31:59 +1300 Subject: Fix nadia (nw) --- hash/nes.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hash/nes.xml b/hash/nes.xml index c3dd3d6749c..dcac9ae39b9 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -45727,6 +45727,10 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx + + + + -- cgit v1.2.3-70-g09d2 From 41ea0f53eb3e4a598dd31f00cf1ea41aa2200715 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 15 Nov 2015 20:41:16 +0100 Subject: nothing --- src/mame/drivers/fidelz80.cpp | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 6c365401a77..8d109b5e963 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -1177,77 +1177,77 @@ static INPUT_PORTS_START( vsc ) //buttons on the right PORT_START("COL_I") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Pawn") PORT_CODE(KEYCODE_1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Rook") PORT_CODE(KEYCODE_2) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Knight") PORT_CODE(KEYCODE_3) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Bishop") PORT_CODE(KEYCODE_4) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Queen") PORT_CODE(KEYCODE_5) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("King") PORT_CODE(KEYCODE_6) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_DEL) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RE") PORT_CODE(KEYCODE_R) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Pawn") PORT_CODE(KEYCODE_1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Rook") PORT_CODE(KEYCODE_2) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Knight") PORT_CODE(KEYCODE_3) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Bishop") PORT_CODE(KEYCODE_4) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Queen") PORT_CODE(KEYCODE_5) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("King") PORT_CODE(KEYCODE_6) + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_DEL) + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RE") PORT_CODE(KEYCODE_R) //buttons beside the display PORT_START("COL_L") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("TM") PORT_CODE(KEYCODE_T) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RV") PORT_CODE(KEYCODE_V) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Speak") PORT_CODE(KEYCODE_SPACE) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("LV") PORT_CODE(KEYCODE_L) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("DM") PORT_CODE(KEYCODE_M) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ST") PORT_CODE(KEYCODE_S) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("TM") PORT_CODE(KEYCODE_T) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RV") PORT_CODE(KEYCODE_V) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Speak") PORT_CODE(KEYCODE_SPACE) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("LV") PORT_CODE(KEYCODE_L) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("DM") PORT_CODE(KEYCODE_M) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ST") PORT_CODE(KEYCODE_S) INPUT_PORTS_END static INPUT_PORTS_START( bridgec ) PORT_START("LINE1") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("10") PORT_CODE(KEYCODE_0) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_START("LINE2") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_START("LINE3") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("P") PORT_CODE(KEYCODE_Z) PORT_START("LINE4") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("NT") PORT_CODE(KEYCODE_N) PORT_START("LINE5") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("EN") PORT_CODE(KEYCODE_E) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("SC") PORT_CODE(KEYCODE_S) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("PL") PORT_CODE(KEYCODE_X) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Spades") PORT_CODE(KEYCODE_1_PAD) PORT_START("LINE6") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_C) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("DB") PORT_CODE(KEYCODE_D) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("VL") PORT_CODE(KEYCODE_V) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Hearts") PORT_CODE(KEYCODE_2_PAD) PORT_START("LINE7") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Beep on/off") PORT_CODE(KEYCODE_SPACE) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("PB") PORT_CODE(KEYCODE_B) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("CV") PORT_CODE(KEYCODE_G) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Diamonds") PORT_CODE(KEYCODE_3_PAD) PORT_START("LINE8") - PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("RE") PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, fidelz80_state, bridgec_trigger_reset, 0) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("BR") PORT_CODE(KEYCODE_T) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("DL") PORT_CODE(KEYCODE_L) -- cgit v1.2.3-70-g09d2 From a044a3309f5dccfd466ea63bd65b6a8d0b545fdf Mon Sep 17 00:00:00 2001 From: Robbbert Date: Mon, 16 Nov 2015 20:26:34 +1100 Subject: a6809: removed hack, not needed any more, and fixed recent regression. (nw) --- src/mame/drivers/a6809.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 38a455614ca..98b57f5af99 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -148,10 +148,6 @@ WRITE8_MEMBER( a6809_state::a6809_register_w ) UINT16 temp = m_start_address; UINT16 temq = m_cursor_address; - // data is 18, but we need 19, to give the 20 rows needed by the SAA5050 - if (m_video_index == 9) - data++; - m_crtc->register_w( space, 0, data ); // Get start address @@ -247,7 +243,7 @@ static MACHINE_CONFIG_START( a6809, a6809_state ) MCFG_VIA6522_CB2_HANDLER(WRITELINE(a6809_state, cass_w)) MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line)) - MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL_4MHz / 2) + MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL_4MHz / 2) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(12) -- cgit v1.2.3-70-g09d2 From cabec7b81cea4afd0d0272e791202f99f6e0c408 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 16 Nov 2015 10:30:51 +0100 Subject: Added new doxygen templates and limited basic to core (nw) --- .gitignore | 1 + doxygen/README.md | 8 + doxygen/doxy-boot.js | 123 +++ doxygen/doxygen.config | 2268 +++++++++++++++++++++++++++++++++++++++++++++ doxygen/footer.html | 31 + doxygen/header.html | 46 + doxygen/style.css | 367 ++++++++ makefile | 2 +- mame.doxygen | 2381 ------------------------------------------------ 9 files changed, 2845 insertions(+), 2382 deletions(-) create mode 100644 doxygen/README.md create mode 100644 doxygen/doxy-boot.js create mode 100644 doxygen/doxygen.config create mode 100644 doxygen/footer.html create mode 100644 doxygen/header.html create mode 100644 doxygen/style.css delete mode 100644 mame.doxygen diff --git a/.gitignore b/.gitignore index b20b719d9cf..2457b727f9e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ !/scripts/ !/src/ !/tests/ +!/doxygen/ !/web/ !/.gitattributes !/.gitignore diff --git a/doxygen/README.md b/doxygen/README.md new file mode 100644 index 00000000000..a6eb47da12d --- /dev/null +++ b/doxygen/README.md @@ -0,0 +1,8 @@ +What is MAME? +============= + +MAME stands for Multiple Arcade Machine Emulator. + +MAME's purpose is to preserve decades of video-game history. As gaming technology continues to rush forward, MAME prevents these important "vintage" games from being lost and forgotten. This is achieved by documenting the hardware and how it functions. The source code to MAME serves as this documentation. The fact that the games are playable serves primarily to validate the accuracy of the documentation (how else can you prove that you have recreated the hardware faithfully?). + + diff --git a/doxygen/doxy-boot.js b/doxygen/doxy-boot.js new file mode 100644 index 00000000000..4b48553acc4 --- /dev/null +++ b/doxygen/doxy-boot.js @@ -0,0 +1,123 @@ +$( document ).ready(function() { + + $("div.headertitle").addClass("page-header"); + $("div.title").addClass("h1"); + + $('li > a[href="index.html"] > span').before(" "); + $('li > a[href="modules.html"] > span').before(" "); + $('li > a[href="namespaces.html"] > span').before(" "); + $('li > a[href="annotated.html"] > span').before(" "); + $('li > a[href="classes.html"] > span').before(" "); + $('li > a[href="inherits.html"] > span').before(" "); + $('li > a[href="functions.html"] > span').before(" "); + $('li > a[href="functions_func.html"] > span').before(" "); + $('li > a[href="functions_vars.html"] > span').before(" "); + $('li > a[href="functions_enum.html"] > span').before(" "); + $('li > a[href="functions_eval.html"] > span').before(" "); + $('img[src="ftv2ns.png"]').replaceWith('N '); + $('img[src="ftv2cl.png"]').replaceWith('C '); + + $("div#navrow1 > ul.tablist").addClass("nav nav-pills"); + $("div#navrow1 > ul.tablist").addClass("nav-justified"); + $("div#navrow2 > ul.tablist").addClass("nav nav-tabs"); + $("div#navrow3 > ul.tablist").addClass("pager"); + $("div#navrow4 > ul.tablist").addClass("pagination pagination-sm center"); + $("div#navrow5 > ul.tablist").addClass("pagination pagination-sm pagination-centered"); + $("ul.tablist").css("margin-top", "0.5em"); + $("ul.tablist").css("margin-bottom", "0.5em"); + $("li.current").addClass("active"); + $("iframe").attr("scrolling", "yes"); + + $("#nav-path > ul").addClass("breadcrumb"); + + $("table.params").addClass("table"); + $("div.ingroups").wrapInner(""); + $("div.levels").css("margin", "0.5em"); + $("div.levels > span").addClass("btn btn-default btn-xs"); + $("div.levels > span").css("margin-right", "0.25em"); + + $("table.directory").addClass("table table-striped"); + $("div.summary > a").addClass("btn btn-default btn-xs"); + $("table.fieldtable").addClass("table"); + $(".fragment").addClass("well"); + $(".memitem").addClass("panel panel-default"); + $(".memproto").addClass("panel-heading"); + $(".memdoc").addClass("panel-body"); + $("span.mlabel").addClass("label label-info"); + + $("table.memberdecls").addClass("table"); + $("[class^=memitem]").addClass("active"); + + $("div.ah").addClass("btn btn-default"); + $("span.mlabels").addClass("pull-right"); + $("table.mlabels").css("width", "100%") + $("td.mlabels-right").addClass("pull-right"); + + $("div.ttc").addClass("panel panel-primary"); + $("div.ttname").addClass("panel-heading"); + $("div.ttname a").css("color", 'white'); + $("div.ttdef,div.ttdoc,div.ttdeci").addClass("panel-body"); + + $('#MSearchBox').parent().remove(); + + //$('div.fragment.well div.line:first').css('margin-top', '15px'); + //$('div.fragment.well div.line:last').css('margin-bottom', '15px'); + + $('table.doxtable').removeClass('doxtable').addClass('table table-striped table-bordered').each(function(){ + $(this).prepend(''); + $(this).find('tbody > tr:first').prependTo($(this).find('thead')); + + $(this).find('td > span.success').parent().addClass('success'); + $(this).find('td > span.warning').parent().addClass('warning'); + $(this).find('td > span.danger').parent().addClass('danger'); + }); + + if($('div.fragment.well div.ttc').length > 0) + { + $('div.fragment.well div.line:first').parent().removeClass('fragment well'); + } + + $('table.memberdecls').find('.memItemRight').each(function(){ + $(this).contents().appendTo($(this).siblings('.memItemLeft')); + $(this).siblings('.memItemLeft').attr('align', 'left'); + }); + + function getOriginalWidthOfImg(img_element) { + var t = new Image(); + t.src = (img_element.getAttribute ? img_element.getAttribute("src") : false) || img_element.src; + return t.width; + } + + $('div.dyncontent').find('img').each(function(){ + if(getOriginalWidthOfImg($(this)[0]) > $('#content>div.container').width()) + $(this).css('width', '100%'); + }); + + $(".memitem").removeClass('memitem'); + $(".memproto").removeClass('memproto'); + $(".memdoc").removeClass('memdoc'); + $("span.mlabel").removeClass('mlabel'); + $("table.memberdecls").removeClass('memberdecls'); + $("[class^=memitem]").removeClass('memitem'); + $("span.mlabels").removeClass('mlabels'); + $("table.mlabels").removeClass('mlabels'); + $("td.mlabels-right").removeClass('mlabels-right'); + $(".navpath").removeClass('navpath'); + $("li.navelem").removeClass('navelem'); + $("a.el").removeClass('el'); + $("div.ah").removeClass('ah'); + $("div.header").removeClass("header"); + + $('.mdescLeft').each(function(){ + if($(this).html()==" ") { + $(this).siblings('.mdescRight').attr('colspan', 2); + $(this).remove(); + } + }); + $('td.memItemLeft').each(function(){ + if($(this).siblings('.memItemRight').html()=="") { + $(this).attr('colspan', 2); + $(this).siblings('.memItemRight').remove(); + } + }); +}); diff --git a/doxygen/doxygen.config b/doxygen/doxygen.config new file mode 100644 index 00000000000..c78081f9f05 --- /dev/null +++ b/doxygen/doxygen.config @@ -0,0 +1,2268 @@ +# Doxyfile 1.8.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = MAME + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Multiple Arcade Machine Emulator" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# the documentation. The maximum height of the logo should not exceed 55 pixels +# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo +# to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = output-doc + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese- +# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi, +# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en, +# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, +# Turkish, Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +1# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = src + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a +# new page for each member. If set to NO, the documentation of a member will be +# part of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 2 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. +# +# Note For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = h=C++ inc=C++ + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = YES + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO these classes will be included in the various overviews. This option has +# no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = YES + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the +# todo list. This list is created by putting \todo commands in the +# documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the +# test list. This list is created by putting \test commands in the +# documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES the list +# will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. Do not use file names with spaces, bibtex cannot handle them. See +# also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO doxygen will only warn about wrong or incomplete parameter +# documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. + +INPUT = doxygen/README.md src/emu src/osd src/lib + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = *.h *.cpp *.mm *.md + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = */test/* tst_* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = detail + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER ) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = README.md + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 1 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = . + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = doxygen/header.html + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = doxygen/footer.html + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- +# defined cascading style sheet that is included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefor more robust against future updates. +# Doxygen will copy the style sheet file to the output directory. For an example +# see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = doxygen/style.css + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = doxygen/doxy-boot.js + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the stylesheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = YES + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated ( +# YES) or that it should be included in the master .chm file ( NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated ( +# YES) or a normal table of contents ( NO) in the .chm file. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 12 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = YES + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /