From fbd35ee85a52a195a99d4a8e8aeabbabb21ef39d Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sun, 8 Jan 2012 14:41:35 +0000 Subject: Cleanups and version bump --- src/emu/cpu/arm7/arm7.c | 28 ++++++++++++------------ src/emu/cpu/arm7/arm7core.c | 4 ++-- src/emu/cpu/arm7/arm7core.h | 4 ++-- src/emu/cpu/i386/i386op16.c | 2 +- src/emu/cpu/i386/pentops.c | 2 +- src/emu/diimage.c | 10 ++++----- src/emu/drawgfxm.h | 12 +++++------ src/emu/machine/s3c24xx.c | 2 +- src/emu/machine/scsihd.c | 2 +- src/emu/rendutil.c | 2 +- src/emu/screen.c | 2 +- src/emu/tilemap.c | 4 ++-- src/emu/uiswlist.c | 4 ++-- src/emu/video/pc_vga.c | 16 +++++++------- src/lib/formats/mfi_dsk.c | 2 +- src/lib/util/astring.c | 24 ++++++++++----------- src/lib/util/astring.h | 6 +++--- src/lib/util/bitmap.c | 12 +++++------ src/lib/util/bitmap.h | 14 ++++++------ src/lib/util/zippath.c | 2 +- src/mame/drivers/funkball.c | 18 ++++++++-------- src/mame/drivers/gamecstl.c | 4 ++-- src/mame/drivers/mcr.c | 2 +- src/mame/drivers/mediagx.c | 4 ++-- src/mame/drivers/midqslvr.c | 52 ++++++++++++++++++++++----------------------- src/mame/drivers/namcona1.c | 2 +- src/mame/drivers/pcxt.c | 4 ++-- src/mame/drivers/pgm.c | 8 +++---- src/mame/drivers/queen.c | 40 +++++++++++++++++----------------- src/mame/drivers/savquest.c | 14 ++++++------ src/mame/drivers/su2000.c | 38 ++++++++++++++++----------------- src/mame/drivers/summit.c | 4 ++-- src/mame/drivers/tourvis.c | 12 +++++------ src/mame/drivers/xtom3d.c | 36 +++++++++++++++---------------- src/mame/machine/cdi070.c | 20 ++++++++--------- src/mame/machine/steppers.c | 32 ++++++++++++++-------------- src/mame/video/m10.c | 2 +- src/mame/video/ppu2c0x.c | 2 +- src/mame/video/segas32.c | 4 ++-- src/mame/video/skyfox.c | 2 +- src/mame/video/subs.c | 2 +- src/mame/video/tx1.c | 2 +- src/tools/src2html.c | 2 +- src/version.c | 2 +- 44 files changed, 231 insertions(+), 231 deletions(-) diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index 09e42561faf..fcea2197747 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -307,7 +307,7 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) LOG( ( "ARM7: Translation fault on unmapped virtual address, PC = %08x, vaddr = %08x\n", R15, vaddr ) ); cpustate->pendingAbtP = 1; } - return FALSE; + return FALSE; break; case COPRO_TLB_COARSE_TABLE: // Entry is the physical address of a coarse second-level table @@ -323,9 +323,9 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) case COPRO_TLB_SECTION_TABLE: { // Entry is a section - UINT8 ap = (desc_lvl1 >> 10) & 3; - int fault = detect_fault( cpustate, permission, ap, flags); - if (fault == FAULT_NONE) + UINT8 ap = (desc_lvl1 >> 10) & 3; + int fault = detect_fault( cpustate, permission, ap, flags); + if (fault == FAULT_NONE) { paddr = ( desc_lvl1 & COPRO_TLB_SECTION_PAGE_MASK ) | ( vaddr & ~COPRO_TLB_SECTION_PAGE_MASK ); } @@ -334,12 +334,12 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) if (flags & ARM7_TLB_ABORT_D) { LOG( ( "ARM7: Section Table, Section %s fault on virtual address, vaddr = %08x, PC = %08x\n", (fault == FAULT_DOMAIN) ? "domain" : "permission", vaddr, R15 ) ); - COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (9 << 0) : (13 << 0)) | (domain << 4); // 9 = section domain fault, 13 = section permission fault + COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (9 << 0) : (13 << 0)) | (domain << 4); // 9 = section domain fault, 13 = section permission fault COPRO_FAULT_ADDRESS = vaddr; cpustate->pendingAbtD = 1; - LOG( ( "vaddr %08X desc_lvl1 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", - vaddr, desc_lvl1, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, - GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); + LOG( ( "vaddr %08X desc_lvl1 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", + vaddr, desc_lvl1, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, + GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); } else if (flags & ARM7_TLB_ABORT_P) { @@ -389,7 +389,7 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) UINT8 ap = ((((desc_lvl2 >> 4) & 0xFF) >> (((vaddr >> 10) & 3) << 1)) & 3); int fault = detect_fault( cpustate, permission, ap, flags); if (fault == FAULT_NONE) - { + { paddr = ( desc_lvl2 & COPRO_TLB_SMALL_PAGE_MASK ) | ( vaddr & ~COPRO_TLB_SMALL_PAGE_MASK ); } else @@ -398,12 +398,12 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) { // hapyfish expects a data abort when something tries to write to a read-only memory location from user mode LOG( ( "ARM7: Page Table, Section %s fault on virtual address, vaddr = %08x, PC = %08x\n", (fault == FAULT_DOMAIN) ? "domain" : "permission", vaddr, R15 ) ); - COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (11 << 0) : (15 << 0)) | (domain << 4); // 11 = page domain fault, 15 = page permission fault - COPRO_FAULT_ADDRESS = vaddr; + COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (11 << 0) : (15 << 0)) | (domain << 4); // 11 = page domain fault, 15 = page permission fault + COPRO_FAULT_ADDRESS = vaddr; cpustate->pendingAbtD = 1; - LOG( ( "vaddr %08X desc_lvl2 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", - vaddr, desc_lvl2, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, - GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); + LOG( ( "vaddr %08X desc_lvl2 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", + vaddr, desc_lvl2, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, + GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); } else if (flags & ARM7_TLB_ABORT_P) { diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index f75f554de41..0ed7d332a14 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -816,8 +816,8 @@ static void HandleCoProcRT(arm_state *cpustate, UINT32 insn) { UINT32 res = arm7_coproc_rt_r_callback(cpustate->device, insn, 0); // RT Read handler must parse opcode & return appropriate result if (cpustate->pendingUnd == 0) - { - SET_REGISTER(cpustate, (insn >> 12) & 0xf, res); + { + SET_REGISTER(cpustate, (insn >> 12) & 0xf, res); } } else diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h index 80e31e2b58d..77360f8cca1 100644 --- a/src/emu/cpu/arm7/arm7core.h +++ b/src/emu/cpu/arm7/arm7core.h @@ -139,8 +139,8 @@ enum #define COPRO_DOMAIN_ACCESS_CONTROL cpustate->domainAccessControl -#define COPRO_FAULT_STATUS_D cpustate->faultStatus[0] -#define COPRO_FAULT_STATUS_P cpustate->faultStatus[1] +#define COPRO_FAULT_STATUS_D cpustate->faultStatus[0] +#define COPRO_FAULT_STATUS_P cpustate->faultStatus[1] #define COPRO_FAULT_ADDRESS cpustate->faultAddress diff --git a/src/emu/cpu/i386/i386op16.c b/src/emu/cpu/i386/i386op16.c index 7dbaa84e543..4e3def04992 100644 --- a/src/emu/cpu/i386/i386op16.c +++ b/src/emu/cpu/i386/i386op16.c @@ -3288,7 +3288,7 @@ static void I386OP(lar_r16_rm16)(i386_state *cpustate) // Opcode 0x0f 0x02 if(seg.selector == 0) { SetZF(0); // not a valid segment - // logerror("i386 (%08x): LAR: Selector %04x is invalid type.\n",cpustate->pc,seg.selector); + // logerror("i386 (%08x): LAR: Selector %04x is invalid type.\n",cpustate->pc,seg.selector); } else { diff --git a/src/emu/cpu/i386/pentops.c b/src/emu/cpu/i386/pentops.c index 09178890c29..52307b63219 100644 --- a/src/emu/cpu/i386/pentops.c +++ b/src/emu/cpu/i386/pentops.c @@ -85,4 +85,4 @@ static void PENTIUMOP(sse_group0fae)(i386_state *cpustate) // Opcode 0x0f ae static void PENTIUMOP(ud2)(i386_state *cpustate) // Opcode 0x0f 0b { i386_trap(cpustate, 6, 0, 0); -} \ No newline at end of file +} diff --git a/src/emu/diimage.c b/src/emu/diimage.c index fee67bceb2a..c063c17977c 100644 --- a/src/emu/diimage.c +++ b/src/emu/diimage.c @@ -1046,7 +1046,7 @@ public: virtual ~ui_menu_control_device_image(); virtual void populate(); virtual void handle(); - + private: enum { START_FILE, START_OTHER_PART, START_SOFTLIST, SELECT_PARTLIST, SELECT_ONE_PART, SELECT_OTHER_PART, SELECT_FILE, CREATE_FILE, CREATE_CONFIRM, DO_CREATE, SELECT_SOFTLIST @@ -1241,7 +1241,7 @@ void ui_menu_control_device_image::handle() software_list_close(swl); state = SELECT_SOFTLIST; break; - + } break; @@ -1261,7 +1261,7 @@ void ui_menu_control_device_image::handle() case -1: // return to system ui_menu::stack_pop(machine()); break; - + } break; @@ -1306,12 +1306,12 @@ void ui_menu_control_device_image::handle() int err = image->create(path, 0, NULL); if (err != 0) popmessage("Error: %s", image->error()); - ui_menu::stack_pop(machine()); + ui_menu::stack_pop(machine()); } } else { state = START_FILE; handle(); - } + } break; } diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index 617c641d2f7..b85668b94da 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -1097,7 +1097,7 @@ do { \ { \ PRIORITY_TYPE *priptr = PRIORITY_ADDR(priority, PRIORITY_TYPE, cury, cliprect.min_x); \ PIXEL_TYPE *destptr = &dest.pix(cury, cliprect.min_x); \ - const PIXEL_TYPE *srcptr = &src.pix(starty >> 16); \ + const PIXEL_TYPE *srcptr = &src.pix(starty >> 16); \ INT32 srcx = startx; \ \ starty = (starty + incyy) & srcfixheight; \ @@ -1156,7 +1156,7 @@ do { \ { \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[0], priptr[0], srcptr[0]); \ } \ srcx += incxx; \ @@ -1164,7 +1164,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[1], priptr[1], srcptr[0]); \ } \ srcx += incxx; \ @@ -1172,7 +1172,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[2], priptr[2], srcptr[0]); \ } \ srcx += incxx; \ @@ -1180,7 +1180,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[3], priptr[3], srcptr[0]); \ } \ srcx += incxx; \ @@ -1195,7 +1195,7 @@ do { \ { \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[0], priptr[0], srcptr[0]); \ } \ srcx += incxx; \ diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c index 180b31bacd6..5c778d3db2e 100644 --- a/src/emu/machine/s3c24xx.c +++ b/src/emu/machine/s3c24xx.c @@ -2107,7 +2107,7 @@ static READ32_DEVICE_HANDLER( s3c24xx_usb_host_r ) // HcRhStatus case 0x50 / 4: { - data = data & ~(1 << 16); // "The Root Hub does not support the local power status feature; thus, this bit is always read as ‘0’." + data = data & ~(1 << 16); // "The Root Hub does not support the local power status feature; thus, this bit is always read as ?0?." } break; } diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c index f58776ec3ec..a5da6e39a2f 100644 --- a/src/emu/machine/scsihd.c +++ b/src/emu/machine/scsihd.c @@ -267,7 +267,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr our_this->disk = device->subdevice(diskregion)->get_hard_disk_file(); } } - + if (!our_this->disk) { our_this->is_file = FALSE; diff --git a/src/emu/rendutil.c b/src/emu/rendutil.c index c4bc491fa64..ac4a1e806c1 100644 --- a/src/emu/rendutil.c +++ b/src/emu/rendutil.c @@ -632,7 +632,7 @@ void render_load_png(bitmap_t &bitmap, emu_file &file, const char *dirname, cons { png_info png; png_error result; - + bitmap.deallocate(); /* open the file */ diff --git a/src/emu/screen.c b/src/emu/screen.c index ef2803ad8b4..f67ba97480c 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -529,7 +529,7 @@ void screen_device::realloc_screen_bitmaps() m_texture[0]->set_bitmap(&m_bitmap[0], &m_visarea, m_texture_format, palette); m_texture[1] = machine().render().texture_alloc(); m_texture[1]->set_bitmap(&m_bitmap[1], &m_visarea, m_texture_format, palette); - + // allocate generic backing bitmap m_default.allocate(curwidth, curheight, m_format); m_default.set_palette(machine().palette); diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index 52f8f47c745..aecadab3c90 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -117,10 +117,10 @@ public: INT32 dy_flipped; /* global vertical scroll offset when flipped */ /* pixel data */ - bitmap_t pixmap; /* cached pixel data */ + bitmap_t pixmap; /* cached pixel data */ /* transparency mapping */ - bitmap_t flagsmap; /* per-pixel flags */ + bitmap_t flagsmap; /* per-pixel flags */ UINT8 * tileflags; /* per-tile flags */ UINT8 * pen_to_flags; /* mapping of pens to flags */ diff --git a/src/emu/uiswlist.c b/src/emu/uiswlist.c index 011e416059e..136e142eab4 100644 --- a/src/emu/uiswlist.c +++ b/src/emu/uiswlist.c @@ -395,8 +395,8 @@ void ui_menu_software::handle() const ui_menu_event *event = process(0); if (event != NULL && event->iptkey == IPT_UI_SELECT) { - // ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_list(machine(), container, (software_list_config *)event->itemref, image))); + // ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_list(machine(), container, (software_list_config *)event->itemref, image))); *result = (software_list_config *)event->itemref; ui_menu::stack_pop(machine()); - } + } } diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index de80f7c97a6..1c7e83c10ab 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -16,14 +16,14 @@ ega/vga 64k (early ega 16k) words of 32 bit memory - TODO: - - modernize - - convert to a device. - - fix pixel clock - - add emulated mc6845 hook-up - - fix resolution change - - fix video update. - - (and many more ...) + TODO: + - modernize + - convert to a device. + - fix pixel clock + - add emulated mc6845 hook-up + - fix resolution change + - fix video update. + - (and many more ...) ROM declarations: diff --git a/src/lib/formats/mfi_dsk.c b/src/lib/formats/mfi_dsk.c index d756410ef3a..e4849587a17 100644 --- a/src/lib/formats/mfi_dsk.c +++ b/src/lib/formats/mfi_dsk.c @@ -53,7 +53,7 @@ preservation formats encode that information, it is guessed for others. The write track function of fdcs should set it. The representation is the angular position relative to the index. - + The media type is divided in two parts. The first half indicate the physical form factor, i.e. all medias with that form factor can be physically inserted in a reader that handles diff --git a/src/lib/util/astring.c b/src/lib/util/astring.c index e890eea884a..2c001f3db62 100644 --- a/src/lib/util/astring.c +++ b/src/lib/util/astring.c @@ -143,7 +143,7 @@ astring &astring::init() astring::~astring() { - if (m_text != m_smallbuf) + if (m_text != m_smallbuf) delete[] m_text; } @@ -172,7 +172,7 @@ astring &astring::cpy(const char *src, int count) //------------------------------------------------- -// cpysubstr - copy a substring of one string to +// cpysubstr - copy a substring of one string to // another //------------------------------------------------- @@ -208,7 +208,7 @@ astring &astring::ins(int insbefore, const char *src, int count) //------------------------------------------------- -// inssubstr - insert a substring of one string +// inssubstr - insert a substring of one string // into another //------------------------------------------------- @@ -220,7 +220,7 @@ astring &astring::inssubstr(int insbefore, const astring &src, int start, int co //------------------------------------------------- -// substr - extract a substring of ourself, +// substr - extract a substring of ourself, // removing everything else //------------------------------------------------- @@ -242,7 +242,7 @@ astring &astring::substr(int start, int count) //------------------------------------------------- -// del - delete a substring of ourself, keeping +// del - delete a substring of ourself, keeping // everything else //------------------------------------------------- @@ -281,7 +281,7 @@ int astring::vprintf(const char *format, va_list args) //------------------------------------------------- -// catprintf - formatted vprintf to the end of +// catprintf - formatted vprintf to the end of // an astring //------------------------------------------------- @@ -367,7 +367,7 @@ int astring::icmpsubstr(const astring &str2, int start, int count) const //------------------------------------------------- -// chr - return the index of a character in an +// chr - return the index of a character in an // astring //------------------------------------------------- @@ -379,7 +379,7 @@ int astring::chr(int start, int ch) const //------------------------------------------------- -// rchr - return the index of a character in an +// rchr - return the index of a character in an // astring, searching from the end //------------------------------------------------- @@ -402,8 +402,8 @@ int astring::find(int start, const char *search) const //------------------------------------------------- -// replacec - search in an astring for a C string, -// replacing all instances with another C string +// replacec - search in an astring for a C string, +// replacing all instances with another C string // and returning the number of matches //------------------------------------------------- @@ -444,7 +444,7 @@ astring &astring::delchr(int ch) //------------------------------------------------- -// replacechr - replace all instances of 'ch' +// replacechr - replace all instances of 'ch' // with 'newch' //------------------------------------------------- @@ -485,7 +485,7 @@ astring &astring::makelower() //------------------------------------------------- -// trimspace - remove all space characters from +// trimspace - remove all space characters from // beginning/end //------------------------------------------------- diff --git a/src/lib/util/astring.h b/src/lib/util/astring.h index dfac762f065..09236de8f5d 100644 --- a/src/lib/util/astring.h +++ b/src/lib/util/astring.h @@ -94,18 +94,18 @@ public: bool operator>=(const char *string) const { return (cmp(string) >= 0); } bool operator>=(const astring &string) const { return (cmp(string) >= 0); } - // character access operators + // character access operators char operator[](int index) const { return (index < len()) ? m_text[index] : 0; } // implicit boolean conversion operators operator bool() { return m_text[0] != 0; } operator bool() const { return m_text[0] != 0; } - + // C string conversion operators and helpers operator const char *() const { return m_text; } const char *cstr() const { return m_text; } char *stringbuffer(int size) { ensure_room(size); return m_text; } - + // buffer management astring &reset() { return cpy(""); } astring &expand(int length) { ensure_room(length); return *this; } diff --git a/src/lib/util/bitmap.c b/src/lib/util/bitmap.c index f64302e9567..42befb052cb 100644 --- a/src/lib/util/bitmap.c +++ b/src/lib/util/bitmap.c @@ -110,7 +110,7 @@ void bitmap_t::allocate(int width, int height, bitmap_format format, int xslop, { // delete any existing stuff deallocate(); - + // initialize fields m_rowpixels = (width + 2 * xslop + 7) & ~7; m_width = width; @@ -120,7 +120,7 @@ void bitmap_t::allocate(int width, int height, bitmap_format format, int xslop, if (m_bpp == 0) throw std::bad_alloc(); m_cliprect.set(0, width - 1, 0, height - 1); - + // allocate memory for the bitmap itself size_t allocbytes = m_rowpixels * (m_height + 2 * yslop) * m_bpp / 8; m_alloc = new UINT8[allocbytes]; @@ -145,7 +145,7 @@ void bitmap_t::deallocate() delete[] m_alloc; m_alloc = NULL; m_base = NULL; - + // reset all fields m_rowpixels = 0; m_width = 0; @@ -157,8 +157,8 @@ void bitmap_t::deallocate() //------------------------------------------------- -// clone_existing -- clone an existing bitmap by -// copying its fields; the target bitmap does not +// clone_existing -- clone an existing bitmap by +// copying its fields; the target bitmap does not // own the memory //------------------------------------------------- @@ -181,7 +181,7 @@ void bitmap_t::clone_existing(const bitmap_t &srcbitmap) //------------------------------------------------- -// set_palette -- associate a palette with a +// set_palette -- associate a palette with a // bitmap //------------------------------------------------- diff --git a/src/lib/util/bitmap.h b/src/lib/util/bitmap.h index 969e34f8e40..98ff5c6e133 100644 --- a/src/lib/util/bitmap.h +++ b/src/lib/util/bitmap.h @@ -94,13 +94,13 @@ public: if (src.max_y > max_y) max_y = src.max_y; return *this; } - + // other helpers bool empty() const { return (min_x > max_x || min_y > max_y); } bool contains(INT32 x, INT32 y) const { return (x >= min_x && x <= max_x && y >= min_y && y <= max_y); } INT32 width() const { return max_x + 1 - min_x; } INT32 height() const { return max_y + 1 - min_y; } - + // setters void set(INT32 minx, INT32 maxx, INT32 miny, INT32 maxy) { min_x = minx; max_x = maxx; min_y = miny; max_y = maxy; } void set_width(INT32 width) { max_x = min_x + width - 1; } @@ -129,7 +129,7 @@ public: bitmap_t(int width, int height, bitmap_format format, int xslop = 0, int yslop = 0); bitmap_t(void *base, int width, int height, int rowpixels, bitmap_format format); ~bitmap_t(); - + // getters INT32 width() const { return m_width; } INT32 height() const { return m_height; } @@ -140,7 +140,7 @@ public: bool valid() const { return (m_format != BITMAP_FORMAT_INVALID); } palette_t *palette() const { return m_palette; } const rectangle &cliprect() const { return m_cliprect; } - + // operations void allocate(int width, int height, bitmap_format format, int xslop = 0, int yslop = 0); void deallocate(); @@ -153,7 +153,7 @@ public: rectangle clip(x, x + width - 1, y, y + height - 1); fill(color, clip); } - + // pixel access template _PixelType &pix(INT32 y, INT32 x = 0) const { return *(reinterpret_cast<_PixelType *>(m_base) + y * m_rowpixels + x); } @@ -162,7 +162,7 @@ public: UINT32 &pix32(INT32 y, INT32 x = 0) const { return *(reinterpret_cast(m_base) + y * m_rowpixels + x); } UINT64 &pix64(INT32 y, INT32 x = 0) const { return *(reinterpret_cast(m_base) + y * m_rowpixels + x); } void *raw_pixptr(INT32 y, INT32 x = 0) const { return reinterpret_cast(m_base) + (y * m_rowpixels + x) * m_bpp / 8; } - + // static helpers static UINT8 format_to_bpp(bitmap_format format); @@ -171,7 +171,7 @@ private: UINT8 * m_alloc; // pointer to allocated pixel memory void * m_base; // pointer to pixel (0,0) (adjusted for padding) INT32 m_rowpixels; // pixels per row (including padding) - INT32 m_width; // width of the bitmap + INT32 m_width; // width of the bitmap INT32 m_height; // height of the bitmap bitmap_format m_format; // format of the bitmap UINT8 m_bpp; // bits per pixel diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c index 1974fe973ee..3f7d62ba2c3 100644 --- a/src/lib/util/zippath.c +++ b/src/lib/util/zippath.c @@ -522,7 +522,7 @@ static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_ty osd_dir_entry_type current_entry_type; int went_up = FALSE; int i; - + newpath.reset(); /* be conservative */ diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c index f6fbdfc2028..62544e09341 100644 --- a/src/mame/drivers/funkball.c +++ b/src/mame/drivers/funkball.c @@ -126,7 +126,7 @@ public: DECLARE_WRITE8_MEMBER( flash_w ); DECLARE_READ8_MEMBER( flash_data_r ); DECLARE_WRITE8_MEMBER( flash_data_w ); -// DECLARE_WRITE8_MEMBER( bios_ram_w ); +// DECLARE_WRITE8_MEMBER( bios_ram_w ); DECLARE_READ8_MEMBER( fdc_r ); DECLARE_WRITE8_MEMBER( fdc_w ); @@ -468,9 +468,9 @@ WRITE8_MEMBER( funkball_state::flash_w ) else if(offset == 2) { /* 0x83: read from u29/u30 - 0x03: read from u3 - 0x81: init device - */ + 0x03: read from u3 + 0x81: init device + */ m_flash_cmd = data; printf("%02x CMD\n",data); } @@ -575,7 +575,7 @@ static ADDRESS_MAP_START(funkball_map, AS_PROGRAM, 32, funkball_state) AM_RANGE(0x000fc000, 0x000fffff) AM_ROMBANK("bios_bank4") AM_RANGE(0x000e0000, 0x000fffff) AM_WRITE8_LEGACY(bios_ram_w,0xffffffff) AM_RANGE(0x00100000, 0x07ffffff) AM_RAM -// AM_RANGE(0x08000000, 0x0fffffff) AM_NOP +// AM_RANGE(0x08000000, 0x0fffffff) AM_NOP AM_RANGE(0x40008000, 0x400080ff) AM_READWRITE_LEGACY(biu_ctrl_r, biu_ctrl_w) AM_RANGE(0x40010e00, 0x40010eff) AM_RAM AM_BASE(m_unk_ram) AM_RANGE(0xff000000, 0xffffdfff) AM_DEVREADWRITE_LEGACY("voodoo_0", voodoo_r, voodoo_w) @@ -593,16 +593,16 @@ static ADDRESS_MAP_START(funkball_io, AS_IO, 32, funkball_state) AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE_LEGACY("dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w) AM_RANGE(0x00e8, 0x00ef) AM_NOP -// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE_LEGACY("ide", ide_r, ide_w) -// AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE_LEGACY("ide", fdc_r, fdc_w) +// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE_LEGACY("ide", ide_r, ide_w) +// AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE_LEGACY("ide", fdc_r, fdc_w) AM_RANGE(0x03f0, 0x03ff) AM_READWRITE8(fdc_r,fdc_w,0xffffffff) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE_LEGACY("pcibus", pci_32le_r, pci_32le_w) AM_RANGE(0x0360, 0x0363) AM_WRITE8(flash_w,0xffffffff) -// AM_RANGE(0x0320, 0x0323) AM_READ(test_r) -// AM_RANGE(0x036c, 0x036f) AM_READ(test_r) +// AM_RANGE(0x0320, 0x0323) AM_READ(test_r) +// AM_RANGE(0x036c, 0x036f) AM_READ(test_r) ADDRESS_MAP_END static INPUT_PORTS_START( funkball ) diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index d5cd4b97b1a..ac315f39d78 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -3,8 +3,8 @@ Skeleton driver by R. Belmont, based on taitowlf.c by Ville Linde - Note: - - bp 000F16B5 do bx=0x16bb (can't skip this check?) + Note: + - bp 000F16B5 do bx=0x16bb (can't skip this check?) Specs: P3-866, SiS 630 graphics card, SiS 7018 sound, Windows 98, DirectX 8.1. diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index ff673e21ac8..3efb9ec6cec 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -440,7 +440,7 @@ static WRITE8_HANDLER( twotiger_op4_w ) /* play tape, and loop it */ if (!sample_playing(samples, i)) sample_start(samples, i, i, 1); - + /* bit 1 turns cassette on/off */ sample_set_pause(samples, i, ~data & 2); } diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 9252905b692..639c5033fa2 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -385,7 +385,7 @@ static WRITE32_HANDLER( disp_ctrl_w ) { mediagx_state *state = space->machine().driver_data(); -// printf("disp_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); +// printf("disp_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); COMBINE_DATA(state->m_disp_ctrl_reg + offset); } @@ -434,7 +434,7 @@ static WRITE32_HANDLER( memory_ctrl_w ) { mediagx_state *state = space->machine().driver_data(); -// printf("memory_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); +// printf("memory_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); if (offset == 0x20/4) { ramdac_device *ramdac = space->machine().device("ramdac"); diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index 1405f2aeb4d..d60e0d0da74 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -2,8 +2,8 @@ Midway Quicksilver skeleton driver - TODO: - - offrthnd: illegal opcode tripped just after that PIIX4 is recognized + TODO: + - offrthnd: illegal opcode tripped just after that PIIX4 is recognized Main CPU : Intel Celeron 333/366MHz Motherboard : Intel SE440BX-2 @@ -105,24 +105,24 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i printf("MXTC: write %d, %02X, %02X\n", function, reg, data); /* - memory banking with North Bridge: - 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff - ---- xxxx Reserved - 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff - ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff - 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff - ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff - 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff - ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff - 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff - ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff - 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff - ---- xxxx BIOS extension 0xe0000 - 0xe3fff - 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff - ---- xxxx BIOS extension 0xe8000 - 0xebfff - - 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable - */ + memory banking with North Bridge: + 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff + ---- xxxx Reserved + 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff + ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff + 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff + ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff + 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff + ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff + 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff + ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff + 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff + ---- xxxx BIOS extension 0xe0000 - 0xe3fff + 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff + ---- xxxx BIOS extension 0xe8000 - 0xebfff + + 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable + */ switch(reg) { @@ -738,8 +738,8 @@ ROM_START( offrthnd ) ROM_LOAD( "lh28f004sct.u8b1", 0x000000, 0x080000, CRC(ab04a343) SHA1(ba77933400fe470f45ab187bc0d315922caadb12) ) ROM_REGION( 0x8000, "video_bios", ROMREGION_ERASEFF ) // TODO: no VGA card is hooked up, to be removed -// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) -// ROM_CONTINUE( 0x0001, 0x4000 ) +// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) +// ROM_CONTINUE( 0x0001, 0x4000 ) DISK_REGION( "disk" ) DISK_IMAGE( "offrthnd", 0, SHA1(d88f1c5b75361a1e310565a8a5a09c674a4a1a22) ) @@ -750,8 +750,8 @@ ROM_START( hydrthnd ) ROM_LOAD( "lh28f004sct.u8b1", 0x000000, 0x080000, CRC(ab04a343) SHA1(ba77933400fe470f45ab187bc0d315922caadb12) ) ROM_REGION( 0x8000, "video_bios", ROMREGION_ERASEFF ) // TODO: no VGA card is hooked up, to be removed -// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) -// ROM_CONTINUE( 0x0001, 0x4000 ) +// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) +// ROM_CONTINUE( 0x0001, 0x4000 ) DISK_REGION( "disk" ) DISK_IMAGE( "hydro", 0, SHA1(d481d178782943c066b41764628a419cd55f676d) ) @@ -762,8 +762,8 @@ ROM_START( arctthnd ) ROM_LOAD( "m29f002bt.u6", 0x040000, 0x040000, CRC(012c9290) SHA1(cdee6f19d5e5ea5bb1dd6a5ec397ac70b3452790) ) ROM_REGION( 0x8000, "video_bios", ROMREGION_ERASEFF ) // TODO: no VGA card is hooked up, to be removed -// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) -// ROM_CONTINUE( 0x0001, 0x4000 ) +// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) +// ROM_CONTINUE( 0x0001, 0x4000 ) DISK_REGION( "disk" ) DISK_IMAGE( "arctthnd", 0, SHA1(f4373e57c3f453ac09c735b5d8d99ff811416a23) ) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index eb171e28f30..8e261121ab7 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -978,7 +978,7 @@ static TIMER_DEVICE_CALLBACK( namcona1_interrupt ) namcona1_state *state = timer.machine().driver_data(); int scanline = param; int enabled = state->m_mEnableInterrupts ? ~state->m_vreg[0x1a/2] : 0; - + // vblank if (scanline == 224) { diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 8be5629b84d..50f275caa7b 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -391,7 +391,7 @@ static WRITE8_HANDLER( fdc765_data_w ) static WRITE8_HANDLER( drive_selection_w ) { -// pcxt_state *state = space->machine().driver_data(); +// pcxt_state *state = space->machine().driver_data(); /* TODO: properly hook-up upd765 FDC there */ pic8259_ir6_w(space->machine().device("pic8259_1"), 1); @@ -656,7 +656,7 @@ static INPUT_PORTS_START( tetriskr ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coinage ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) duplicate +// PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) duplicate PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 8b8d3056581..47dde83895d 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -115,7 +115,7 @@ ASIC 27A(55857F/55857G): The Killing Blade Plus Spectral VS Generation - The 55857G variant appears to be protected against reading even from native code. + The 55857G variant appears to be protected against reading even from native code. there are probably more... @@ -3701,7 +3701,7 @@ ROM_START( oldsplus ) ROM_LOAD( "oldsplus_igs027a.bin", 0x000000, 0x04000, NO_DUMP ) ROM_REGION( 0x800000, "user1", ROMREGION_ERASE00 ) - + ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */ PGM_VIDEO_BIOS ROM_LOAD( "t05301.rom", 0x180000, 0x800000, CRC(8257bbb0) SHA1(b48067b7e7081a15fddf21739b641d677c2df3d9) ) @@ -5082,7 +5082,7 @@ static WRITE16_HANDLER( puzzli2_asic_w ) //if (state->m_value0 == 6) { state->m_valueresponse = (0x74<<16)|1; // |1? //} else { - // state->m_valueresponse = 0x74<<16; + // state->m_valueresponse = 0x74<<16; //} } break; @@ -5627,7 +5627,7 @@ static DRIVER_INIT( puzzli2 ) machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(ddp3_asic_r), FUNC(puzzli2_asic_w)); machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4fffff, FUNC(sango_protram_r)); - + // doesn't like this irq?? state->m_irq4_disabled = 1; } diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index 59bc5beafca..348f86a8722 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -113,24 +113,24 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i printf("MXTC: write %d, %02X, %02X\n", function, reg, data); /* - memory banking with North Bridge: - 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff - ---- xxxx Reserved - 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff - ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff - 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff - ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff - 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff - ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff - 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff - ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff - 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff - ---- xxxx BIOS extension 0xe0000 - 0xe3fff - 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff - ---- xxxx BIOS extension 0xe8000 - 0xebfff - - 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable - */ + memory banking with North Bridge: + 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff + ---- xxxx Reserved + 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff + ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff + 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff + ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff + 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff + ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff + 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff + ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff + 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff + ---- xxxx BIOS extension 0xe0000 - 0xe3fff + 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff + ---- xxxx BIOS extension 0xe8000 - 0xebfff + + 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable + */ switch(reg) { @@ -725,8 +725,8 @@ ROM_START( queen ) ROM_LOAD( "bios-original.bin", 0x00000, 0x40000, CRC(feb542d4) SHA1(3cc5d8aeb0e3b7d9ed33248a4f3dc507d29debd9) ) ROM_REGION( 0x8000, "video_bios", ROMREGION_ERASEFF ) // TODO: no VGA card is hooked up, to be removed -// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) -// ROM_CONTINUE( 0x0001, 0x4000 ) +// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) +// ROM_CONTINUE( 0x0001, 0x4000 ) DISK_REGION( "ide" ) DISK_IMAGE( "pqiidediskonmodule", 0,SHA1(a56efcc711b1c5a2e63160b3088001a8c4fb56c2) ) diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index a457c39915c..6bdb2c4b1f8 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -5,9 +5,9 @@ "Savage Quest" (c) 1999 Interactive Light, developed by Angel Studios. Skeleton by R. Belmont - TODO: - - BIOS ROM checksum error; - - floppy drive error, system halt; + TODO: + - BIOS ROM checksum error; + - floppy drive error, system halt; H/W is a white-box PC consisting of: Pentium II 450 CPU @@ -77,8 +77,8 @@ protected: // driver_device overrides -// virtual void video_start(); -// virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); +// virtual void video_start(); +// virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); }; // Intel 82439TX System Controller (MXTC) @@ -407,7 +407,7 @@ static ADDRESS_MAP_START(savquest_map, AS_PROGRAM, 32, savquest_state) AM_RANGE(0x000e0000, 0x000fffff) AM_ROMBANK("bank1") AM_RANGE(0x000e0000, 0x000fffff) AM_WRITE(bios_ram_w) AM_RANGE(0x00100000, 0x01ffffff) AM_RAM -// AM_RANGE(0x02000000, 0x02000003) // protection dongle lies there? +// AM_RANGE(0x02000000, 0x02000003) // protection dongle lies there? AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("bios", 0) /* System BIOS */ ADDRESS_MAP_END @@ -427,7 +427,7 @@ static ADDRESS_MAP_START(savquest_io, AS_IO, 32, savquest_state) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE_LEGACY("pcibus", pci_32le_r, pci_32le_w) -// AM_RANGE(0x5000, 0x5007) // routes to port $eb +// AM_RANGE(0x5000, 0x5007) // routes to port $eb ADDRESS_MAP_END static INPUT_PORTS_START( savquest ) diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c index 942c170ec7f..5c7bbbf1c46 100644 --- a/src/mame/drivers/su2000.c +++ b/src/mame/drivers/su2000.c @@ -4,28 +4,28 @@ preliminary driver by Phil Bennett - Known games: - * Dactyl Nightmare SP - * Virtual Boxing - * Buggy Ball - * Missile Command - * Zone Hunter + Known games: + * Dactyl Nightmare SP + * Virtual Boxing + * Buggy Ball + * Missile Command + * Zone Hunter Hardware Info: - See: http://arianchen.de/su2000/status.html - - - TODO: - * Get system booting - * Add game software - * Fix i386 core issues (e.g. protected mode) - * Write MC88110 CPU core - * Emulate HDD and CD drive - * Emulate PIX 1000 card - * Emulate VID 1000 card - * Emulate tracker card - * Emulate format card + See: http://arianchen.de/su2000/status.html + + + TODO: + * Get system booting + * Add game software + * Fix i386 core issues (e.g. protected mode) + * Write MC88110 CPU core + * Emulate HDD and CD drive + * Emulate PIX 1000 card + * Emulate VID 1000 card + * Emulate tracker card + * Emulate format card ***************************************************************************/ diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c index 6cc86c14675..cbe3b0c68c3 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -69,9 +69,9 @@ static ADDRESS_MAP_START( mainmap, AS_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2bff) AM_RAM AM_BASE_MEMBER(summit_state, m_vram) AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") -// AM_RANGE(0x3880, 0x3880) AM_WRITE(out_w) +// AM_RANGE(0x3880, 0x3880) AM_WRITE(out_w) AM_RANGE(0x3900, 0x3900) AM_READ_PORT("IN1") AM_WRITE(out_w) // lamps -// AM_RANGE(0x3980, 0x3980) AM_WRITE(out_w) +// AM_RANGE(0x3980, 0x3980) AM_WRITE(out_w) AM_RANGE(0x3a00, 0x3a00) AM_READ_PORT("IN2") //AM_WRITE(out_w) AM_RANGE(0x3b00, 0x3b00) AM_READ_PORT("IN3") diff --git a/src/mame/drivers/tourvis.c b/src/mame/drivers/tourvis.c index bfaf31fa1af..f0dc9e19f32 100644 --- a/src/mame/drivers/tourvis.c +++ b/src/mame/drivers/tourvis.c @@ -9,10 +9,10 @@ Todo: complete jamma interface emulation. - By now, three known BIOS versions, U4-52 (dumped from a board with-subboard PCB), - U4-55 (dumped from an integrated PCB) and U4-60 (dumped from a board with-subboard PCB). + By now, three known BIOS versions, U4-52 (dumped from a board with-subboard PCB), + U4-55 (dumped from an integrated PCB) and U4-60 (dumped from a board with-subboard PCB). - Known games: + Known games: Special Criminal Investigation Power League IV @@ -29,8 +29,8 @@ Final Lap Columns Power Sports - Saigo no Nindou - Son Son II + Saigo no Nindou + Son Son II _______________________________________________________________________________________________________________________________________________ | | @@ -295,7 +295,7 @@ MACHINE_CONFIG_END ROMX_LOAD( "u4-55_am27c256.ic29", 0x0000, 0x8000, CRC(87cf66c1) SHA1(d6b42137be7a07a0e299c2d922328a6a9a2b7b8f), ROM_BIOS(2) ) \ ROM_SYSTEM_BIOS( 2, "52", "U4-52" ) \ ROMX_LOAD( "bios.29", 0x0000, 0x8000, CRC(ffd7b0fe) SHA1(d1804865c91e925a01b05cf441e8458a3db23f50), ROM_BIOS(3) ) - + ROM_START(tourvis) ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASE00 ) diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index 46928f2d143..0baea2a7f6d 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -118,24 +118,24 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i printf("MXTC: write %d, %02X, %02X\n", function, reg, data); /* - memory banking with North Bridge: - 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff - ---- xxxx Reserved - 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff - ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff - 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff - ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff - 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff - ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff - 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff - ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff - 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff - ---- xxxx BIOS extension 0xe0000 - 0xe3fff - 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff - ---- xxxx BIOS extension 0xe8000 - 0xebfff - - 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable - */ + memory banking with North Bridge: + 0x59 (PAM0) xxxx ---- BIOS area 0xf0000-0xfffff + ---- xxxx Reserved + 0x5a (PAM1) xxxx ---- ISA add-on BIOS 0xc4000 - 0xc7fff + ---- xxxx ISA add-on BIOS 0xc0000 - 0xc3fff + 0x5b (PAM2) xxxx ---- ISA add-on BIOS 0xcc000 - 0xcffff + ---- xxxx ISA add-on BIOS 0xc8000 - 0xcbfff + 0x5c (PAM3) xxxx ---- ISA add-on BIOS 0xd4000 - 0xd7fff + ---- xxxx ISA add-on BIOS 0xd0000 - 0xd3fff + 0x5d (PAM4) xxxx ---- ISA add-on BIOS 0xdc000 - 0xdffff + ---- xxxx ISA add-on BIOS 0xd8000 - 0xdbfff + 0x5e (PAM5) xxxx ---- BIOS extension 0xe4000 - 0xe7fff + ---- xxxx BIOS extension 0xe0000 - 0xe3fff + 0x5f (PAM6) xxxx ---- BIOS extension 0xec000 - 0xeffff + ---- xxxx BIOS extension 0xe8000 - 0xebfff + + 3210 -> 3 = reserved, 2 = Cache Enable, 1 = Write Enable, 0 = Read Enable + */ switch(reg) { diff --git a/src/mame/machine/cdi070.c b/src/mame/machine/cdi070.c index 7cd826529f3..30d307cd560 100644 --- a/src/mame/machine/cdi070.c +++ b/src/mame/machine/cdi070.c @@ -355,16 +355,16 @@ static void quizard_handle_byte_tx(running_machine &machine, scc68070_regs_t *sc if(tx == 0x0a) { /*rx[rx_ptr] = 0; - //printf("Database path: %s\n", rx); - scc68070_uart_rx(machine, scc68070, 0x5a); - scc68070_uart_rx(machine, scc68070, g_state[0]); - scc68070_uart_rx(machine, scc68070, g_state[1]); - scc68070_uart_rx(machine, scc68070, g_state[2]); - scc68070_uart_rx(machine, scc68070, g_state[3]); - scc68070_uart_rx(machine, scc68070, g_state[4]); - scc68070_uart_rx(machine, scc68070, g_state[5]); - scc68070_uart_rx(machine, scc68070, g_state[6]); - scc68070_uart_rx(machine, scc68070, g_state[7]);*/ + //printf("Database path: %s\n", rx); + scc68070_uart_rx(machine, scc68070, 0x5a); + scc68070_uart_rx(machine, scc68070, g_state[0]); + scc68070_uart_rx(machine, scc68070, g_state[1]); + scc68070_uart_rx(machine, scc68070, g_state[2]); + scc68070_uart_rx(machine, scc68070, g_state[3]); + scc68070_uart_rx(machine, scc68070, g_state[4]); + scc68070_uart_rx(machine, scc68070, g_state[5]); + scc68070_uart_rx(machine, scc68070, g_state[6]); + scc68070_uart_rx(machine, scc68070, g_state[7]);*/ state = 0; } break; diff --git a/src/mame/machine/steppers.c b/src/mame/machine/steppers.c index ee080751d86..256da5084f4 100644 --- a/src/mame/machine/steppers.c +++ b/src/mame/machine/steppers.c @@ -211,22 +211,22 @@ int stepper_update(int which, UINT8 pattern) int changed = 0; /* This code probably makes more sense if you visualise what is being emulated, namely - a spinning drum with two electromagnets inside. Essentially, the CPU - activates a pair of windings on these magnets leads as necessary to attract and repel the drum to pull it round and - display as appropriate. To attempt to visualise the rotation effect, take a look at the compass rose below, the numbers - indicate the phase information as used + a spinning drum with two electromagnets inside. Essentially, the CPU + activates a pair of windings on these magnets leads as necessary to attract and repel the drum to pull it round and + display as appropriate. To attempt to visualise the rotation effect, take a look at the compass rose below, the numbers + indicate the phase information as used - 7 - N - 1 W E 5 - S - 3 + 7 + N + 1 W E 5 + S + 3 - For sake of accuracy, we're representing all possible phases of the motor, effectively moving the motor one half step at a time, so a 48 step motor becomes - 96 half steps. This is necessary because of some programs running the wiring in series with a distinct delay between the pair being completed. This causes - a small movement that may trigger the optic. + For sake of accuracy, we're representing all possible phases of the motor, effectively moving the motor one half step at a time, so a 48 step motor becomes + 96 half steps. This is necessary because of some programs running the wiring in series with a distinct delay between the pair being completed. This causes + a small movement that may trigger the optic. - */ + */ { int pos,steps=0; @@ -300,7 +300,7 @@ int stepper_update(int which, UINT8 pattern) step[which].phase = 3; } } - + if (!step[which].stator1[0] && !step[which].stator1[1] && step[which].stator2[0] && step[which].stator2[1]) { if ((step[which].old_phase ==6)||(step[which].old_phase == 4)) // if the previous pattern had the drum in the eastern quadrant, it will point east now @@ -312,7 +312,7 @@ int stepper_update(int which, UINT8 pattern) step[which].phase = 1; } } - } + } break; case MPU3_48STEP_REEL : /* Same unit as above, but different interface (2 active lines, not 4)*/ //TODO - set up stators using manual, this seems to be correct based on the previous behaviour @@ -337,7 +337,7 @@ int stepper_update(int which, UINT8 pattern) if ((step[which].type == BARCREST_48STEP_REEL) || (step[which].type == MPU3_48STEP_REEL)) { steps = step[which].old_phase - step[which].phase; - + if (steps < -4) { steps = steps +8; diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 34d4fde0e8e..e5b3bceb626 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -99,7 +99,7 @@ INLINE void plot_pixel_m10( running_machine &machine, bitmap_t &bm, int x, int y if (!state->m_flip) bm.pix16(y, x) = col; else - bm.pix16((IREMM10_VBSTART - 1) - (y - IREMM10_VBEND) + 6, + bm.pix16((IREMM10_VBSTART - 1) - (y - IREMM10_VBEND) + 6, (IREMM10_HBSTART - 1) - (x - IREMM10_HBEND)) = col; // only when flip_screen(?) } diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 59ac6807753..6819dcf20a2 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -77,7 +77,7 @@ typedef struct _ppu2c0x_state ppu2c0x_state; struct _ppu2c0x_state { address_space *space; /* memory space */ - bitmap_t *bitmap; /* target bitmap */ + bitmap_t *bitmap; /* target bitmap */ UINT8 *spriteram; /* sprite ram */ pen_t *colortable; /* color table modified at run time */ pen_t *colortable_mono; /* monochromatic color table modified at run time */ diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index f335b4548d7..a64680bae79 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -1611,7 +1611,7 @@ static void sprite_swap_buffers(segas32_state *state) #define sprite_draw_pixel_16(trans) \ /* only draw if onscreen, not 0 or 15 */ \ - if (x >= clipin.min_x && x <= clipin.max_x && \ + if (x >= clipin.min_x && x <= clipin.max_x && \ (!do_clipout || x < clipout.min_x || x > clipout.max_x) && \ pix != trans) \ { \ @@ -1640,7 +1640,7 @@ static void sprite_swap_buffers(segas32_state *state) #define sprite_draw_pixel_256(trans) \ /* only draw if onscreen, not 0 or 15 */ \ - if (x >= clipin.min_x && x <= clipin.max_x && \ + if (x >= clipin.min_x && x <= clipin.max_x && \ (!do_clipout || x < clipout.min_x || x > clipout.max_x) && \ pix != trans) \ { \ diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 9205799d460..b0c098c8288 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -266,7 +266,7 @@ static void draw_background(running_machine &machine, bitmap_t &bitmap, const re for (j = 0 ; j <= ((pen & 0x80) ? 0 : 3); j++) bitmap.pix16( - (((j / 2) & 1) + y) % 256, + (((j / 2) & 1) + y) % 256, ((j & 1) + x) % 512) = 256 + (pen & 0x7f); } } diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 826a3f52932..16c67b2bb03 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -61,7 +61,7 @@ SCREEN_UPDATE( subs_left ) charcode = videoram[offs]; /* Which monitor is this for? */ -// right_enable = charcode & 0x40; +// right_enable = charcode & 0x40; left_enable = charcode & 0x80; sx = 8 * (offs % 32); diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index ce8703d1e20..98fa7e4aa32 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -3042,7 +3042,7 @@ SCREEN_EOF( buggyboy ) SCREEN_UPDATE( buggyboy_left ) { tx1_state *state = screen.machine().driver_data(); - + memset(state->m_obj_bmp, 0, 768*240); memset(state->m_rod_bmp, 0, 768*240); diff --git a/src/tools/src2html.c b/src/tools/src2html.c index 7cf620cfc47..7ac8b9bd5a2 100644 --- a/src/tools/src2html.c +++ b/src/tools/src2html.c @@ -94,7 +94,7 @@ struct token_entry struct include_path { include_path * next; - astring path; + astring path; }; diff --git a/src/version.c b/src/version.c index be204e39d20..47d15e42dde 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.144u4 ("__DATE__")"; +const char build_version[] = "0.144u5 ("__DATE__")"; -- cgit v1.2.3