Skip to content

Commit

Permalink
srcclean and manual cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cuavas committed Jan 25, 2025
1 parent afc4a36 commit 587598e
Show file tree
Hide file tree
Showing 44 changed files with 651 additions and 673 deletions.
8 changes: 4 additions & 4 deletions hash/amigaocs_flop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7983,7 +7983,7 @@ ATK test: OK
<notes><![CDATA[
ATK test: OK
]]></notes>
<!-- cover/floppy title -->
<!-- cover/floppy title -->
<info name="alt_title" value="Brutal Football" />
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Disk 1" />
Expand Down Expand Up @@ -12097,7 +12097,7 @@ ATK test: OK
</part>
</software>

<!-- "F40 Pursuit Simulator" alt version known to exist (title screen) -->
<!-- "F40 Pursuit Simulator" alt version known to exist (title screen) -->
<software name="crazycr2" supported="no">
<!-- SPS (CAPS) release 311 -->
<description>Crazy Cars II (Europe)</description>
Expand Down Expand Up @@ -12156,7 +12156,7 @@ ATK test: C:79 H:U 1 Sector Bad
</part>
</software>

<!-- PD version known to exist https://www.aminet.net/package/game/jump/CrazySueII -->
<!-- PD version known to exist https://www.aminet.net/package/game/jump/CrazySueII -->
<software name="crazsue2" supported="no">
<!-- SPS (CAPS) release 2195 -->
<description>Crazy Sue... Goes On (Europe)</description>
Expand All @@ -12168,7 +12168,7 @@ ATK test: C:79 H:U 1 Sector Bad
TODO: test me in full, is track 43 onward bad just a side effect of using RNC cruncher?
ATK test: C:43 onward Bad
]]></notes>
<info name="alt_title" value="Crazy Sue II" />
<info name="alt_title" value="Crazy Sue II" />
<info name="magazine" value="Amiga Mania" />
<info name="release" value="199209xx" />
<!-- Omake: type "HIRONZMUSJUMPSHOE" on title screen to enable cheat mode -->
Expand Down
2 changes: 1 addition & 1 deletion hash/cd32.xml
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ license:CC0-1.0
<description>Brutal Sports Series: Football</description>
<year>1994</year>
<publisher>Millennium</publisher>
<!-- Cover/CD title -->
<!-- Cover/CD title -->
<info name="alt_title" value="Brutal Football" />
<info name="disc_matrix" value="CDD3361 BRUTAL FOOTBALL : MASTERED BY NIMBUS" />
<part name="cdrom" interface="cdrom">
Expand Down
4 changes: 2 additions & 2 deletions hash/jaguar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ No sound, hardlocks then eventually throws an exception after the Dyna Cam logo
Switching items in main menu causes a glitch on the text
Rightmost column of gameplay has odd "overscan" area
]]></notes>
<!-- cover title, NOTE: different than all the other version -->
<info name="alt_title" value="Brutal Sports Football" />
<!-- cover title, NOTE: different than all the other version -->
<info name="alt_title" value="Brutal Sports Football" />
<info name="serial" value="JA100"/>
<part name="cart" interface="jaguar_cart">
<dataarea name="rom" size="2097152" width="32" endianness="big">
Expand Down
2 changes: 1 addition & 1 deletion hash/juku.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ license:CC0-1.0
<info name="developer" value="EktaSoft"/>
<info name="comment" value="Recostruction of an additional JUKU PC utilities disk #4 with EKDOS 2.30 based on file list in READ.ME published by EKTA in December 1989."/> <!-- See https://github.com/infoaed/juku3000/blob/master/docs/ekdos230.txt for READ.ME. -->
<part name="flop1" interface="floppy_5_25">
<feature name="part_id" value="UTILS-4" /><!-- See https://juku3000.infoaed.ee/tarkvara-kataloog/#j3kutil4 for details. -->
<feature name="part_id" value="UTILS-4" /><!-- See https://juku3000.infoaed.ee/tarkvara-kataloog/#j3kutil4 for details. -->
<dataarea name="flop" size="819200">
<rom name="J3KUTIL4.JUK" size="819200" crc="839f20aa" sha1="fb8a5239cdd74eced3b0bb7ab8ec6e8b2092f4c3" />
</dataarea>
Expand Down
4 changes: 2 additions & 2 deletions hash/megacd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16443,7 +16443,7 @@ Black screen, requires sub CPU to be overclocked by 1.5x
<description>Music from the Sega CD Games - Jurassic Park, Batman Returns (USA)</description>
<year>1993</year>
<publisher>Sega Multimedia Studio</publisher>
<sharedfeat name="compatibility" value="NTSC-U"/>
<sharedfeat name="compatibility" value="NTSC-U"/>
<part name="cdrom" interface="scd_cdrom">
<diskarea name="cdrom">
<disk name="music from the sega cd games - jurassic park, batman returns (usa)" status="nodump"/>
Expand All @@ -16462,7 +16462,7 @@ Black screen, requires sub CPU to be overclocked by 1.5x
<description>The Smurfs (USA, Prototype)</description>
<year>2014</year>
<publisher>Good Deal Games</publisher>
<sharedfeat name="compatibility" value="NTSC-U"/>
<sharedfeat name="compatibility" value="NTSC-U"/>
<part name="cdrom" interface="scd_cdrom">
<diskarea name="cdrom">
<disk name="the smurfs (usa, prototype)" status="nodump"/>
Expand Down
2 changes: 1 addition & 1 deletion hash/super_tv_pc_cart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ license:CC0-1.0
<dataarea name="prg" size="0x400000">
<rom name="c-04.u1" size="0x400000" crc="89b6ef86" sha1="1af69047508fce08fa949a7d821255e306a329a3" />
<!-- bypass (invisible) EEPROM error until cart EEPROM is properly hooked up -->
<rom value="0xea" offset="0xd5fa" size="2" loadflag="fill" />
<rom value="0xea" offset="0xd5fa" size="2" loadflag="fill" />
</dataarea>
</part>
</software>
Expand Down
2 changes: 1 addition & 1 deletion hash/zx81_cass.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4325,7 +4325,7 @@ RAND USR 16530
</dataarea>
</part>
</software>

<software name="invent1">
<description>Inventions 1</description>
<year>1982</year>
Expand Down
8 changes: 4 additions & 4 deletions scripts/src/formats.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1056,10 +1056,10 @@ end
--------------------------------------------------

if opt_tool(FORMATS, "H17D_DSK") then
files {
MAME_DIR.. "src/lib/formats/h17disk.cpp",
MAME_DIR.. "src/lib/formats/h17disk.h",
}
files {
MAME_DIR.. "src/lib/formats/h17disk.cpp",
MAME_DIR.. "src/lib/formats/h17disk.h",
}
end

--------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions src/devices/cpu/mcs51/mcs51.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,18 +824,18 @@ uint8_t mcs51_cpu_device::r_psw() { return SFR_A(ADDR_PSW); }

In order to simplify memory mapping to the data address bus, the following address map is assumed for partitioned mode:

PES = 0:
PES = 0:
0x00000-0x0ffff -> data memory on the expanded bus
0x10000-0x1ffff -> data memory on the byte-wide bus
PES = 1:
0x20000-0x2ffff -> memory-mapped peripherals on the byte-wide bus
PES = 1:
0x20000-0x2ffff -> memory-mapped peripherals on the byte-wide bus

For non-partitioned mode the following memory map is assumed:

PES = 0:
PES = 0:
0x00000-0x0ffff -> data memory (the bus used to access it does not matter)
PES = 1:
0x20000-0x2ffff -> memory-mapped peripherals on the byte-wide bus
PES = 1:
0x20000-0x2ffff -> memory-mapped peripherals on the byte-wide bus
*/

offs_t mcs51_cpu_device::external_ram_iaddr(offs_t offset, offs_t mem_mask)
Expand Down
16 changes: 8 additions & 8 deletions src/devices/machine/spg110.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ void spg110_device::ffreq2_w(int state)
}

// notes about IRQ differences from 2xx
//
//
// TMB1 / TMB2 are IRQ7 (same as SPG2xx)
// Key Change is IRQ4 (was 7 on SPG2xx)
// LVD (Low Voltage Reset) is IRQ6 (doesn't exist on SPG2xx?)
// ADC is IRQ1 (was 3 on SPG2xx)
//
//
// on SPG2xx 0x3D2E can redirect any other interrupt to the FIQ
// on SPG110 FIQ is always from SPUIRQ (sound)
//
Expand Down Expand Up @@ -162,25 +162,25 @@ void spg110_device::internal_map(address_map &map)
// 0x2038 // P_Effect_color (not the same as 2030)
map(0x002039, 0x002039).w(m_spg_video, FUNC(spg110_video_device::effect_control_2039_w)); // P_Effect_control
// 0x203a // P_Mix_offset
// 0x203b // P_Fan_effect_th
// 0x203b // P_Fan_effect_th
map(0x00203c, 0x00203c).w(m_spg_video, FUNC(spg110_video_device::huereference_203c_w)); // P_203C_HueRefer (should be set based on PAL/NTSC)
map(0x00203d, 0x00203d).w(m_spg_video, FUNC(spg110_video_device::lum_adjust_203d_w)); // P_Lum_Adjust
map(0x00203d, 0x00203d).w(m_spg_video, FUNC(spg110_video_device::lum_adjust_203d_w)); // P_Lum_Adjust
// 0x203e // P_LPVPosition
// 0x203f // P_LPHPosition

map(0x002042, 0x002042).rw(m_spg_video, FUNC(spg110_video_device::sp_control_2042_r),FUNC(spg110_video_device::sp_control_2042_w)); // P_Sp_control
map(0x002042, 0x002042).rw(m_spg_video, FUNC(spg110_video_device::sp_control_2042_r),FUNC(spg110_video_device::sp_control_2042_w)); // P_Sp_control

map(0x002045, 0x002045).w(m_spg_video, FUNC(spg110_video_device::spg110_2045_w)); // not documented?

map(0x002050, 0x00205f).ram().w(m_spg_video, FUNC(spg110_video_device::transparent_color_205x_w)).share("spg_video:palctrlram"); // P_Trptcolor0 - 15

map(0x002060, 0x002060).w(m_spg_video, FUNC(spg110_video_device::dma_dst_2060_w)); // P_DMA_Target_adr
map(0x002061, 0x002061).w(m_spg_video, FUNC(spg110_video_device::dma_dst_seg_2061_w)); // P_DMA_Target_seg
map(0x002062, 0x002062).rw(m_spg_video, FUNC(spg110_video_device::dma_len_status_2062_r),FUNC(spg110_video_device::dma_len_trigger_2062_w)); // P_DMA_numbr
map(0x002062, 0x002062).rw(m_spg_video, FUNC(spg110_video_device::dma_len_status_2062_r),FUNC(spg110_video_device::dma_len_trigger_2062_w)); // P_DMA_numbr
map(0x002063, 0x002063).rw(m_spg_video, FUNC(spg110_video_device::spg110_2063_r),FUNC(spg110_video_device::spg110_2063_w)); // P_DMA_control - Video IRQ source / ack (3 different things checked here instead of 2 on spg2xx?)
map(0x002064, 0x002064).w(m_spg_video, FUNC(spg110_video_device::dma_dst_step_2064_w)); // P_DMA_Target_step
map(0x002065, 0x002065).rw(m_spg_video, FUNC(spg110_video_device::dma_manual_2065_r), FUNC(spg110_video_device::dma_manual_2065_w)); // P_DMA_data
map(0x002066, 0x002066).w(m_spg_video, FUNC(spg110_video_device::dma_source_2066_w)); // P_DMA_Source_adr
map(0x002065, 0x002065).rw(m_spg_video, FUNC(spg110_video_device::dma_manual_2065_r), FUNC(spg110_video_device::dma_manual_2065_w)); // P_DMA_data
map(0x002066, 0x002066).w(m_spg_video, FUNC(spg110_video_device::dma_source_2066_w)); // P_DMA_Source_adr
map(0x002067, 0x002067).w(m_spg_video, FUNC(spg110_video_device::dma_source_seg_2067_w)); // P_DMA_Source_seg
map(0x002068, 0x002068).rw(m_spg_video, FUNC(spg110_video_device::dma_src_step_2068_r), FUNC(spg110_video_device::dma_src_step_2068_w)); // P_DMA_Source_step

Expand Down
10 changes: 5 additions & 5 deletions src/devices/machine/spg110_video.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ device_memory_interface::space_config_vector spg110_video_device::memory_space_c
}


/* 0x2063 P_DMA_control
/* 0x2063 P_DMA_control
despite the name this address is more IRQ control than DMA, although there are some DMA flags in here

bit15 bit14 bit13 bit12 bit11 bit10 bit9 bit8 bit7 bit6 bit5 bit4 bit3 bit2 bit1 bit0
Expand Down Expand Up @@ -461,7 +461,7 @@ uint16_t spg110_video_device::irq_tm_h_2037_r()
// added to value from the PRNG for some random number generation cases
// should this return the *current* horizontal position? or the register value written?
return m_screen->hpos();
}
}

void spg110_video_device::irq_tm_h_2037_w(uint16_t data)
{
Expand All @@ -474,13 +474,13 @@ void spg110_video_device::effect_control_2039_w(uint16_t data)
{
// 0803 on every scene transition
logerror("%s: effect_control_2039_w: %04x\n", machine().describe_context(), data);
}
}

void spg110_video_device::huereference_203c_w(uint16_t data)
{
// 0006 on startup, twice
logerror("%s: huereference_203c_w: %04x\n", machine().describe_context(), data);
}
}

void spg110_video_device::lum_adjust_203d_w(uint16_t data)
{
Expand All @@ -497,7 +497,7 @@ void spg110_video_device::sp_control_2042_w(uint16_t data)
{
// sets bit 0x0004, masks with 0xfffb etc.
logerror("%s: sp_control_2042_w: %04x\n", machine().describe_context(), data);
}
}

void spg110_video_device::spg110_2045_w(uint16_t data)
{
Expand Down
6 changes: 3 additions & 3 deletions src/devices/machine/spg_renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ void spg_renderer_device::draw_linemap(bool has_extended_tilemaps, const rectang
uint32_t palette_map = tilemapregs[3];

//if (scanline == 128)
// popmessage("draw draw_linemap reg0 %04x reg1 %04x bases %04x %04x\n", tilemapregs[0], tilemapregs[1], tilemap, palette_map);
// popmessage("draw draw_linemap reg0 %04x reg1 %04x bases %04x %04x\n", tilemapregs[0], tilemapregs[1], tilemap, palette_map);

//uint32_t xscroll = scrollregs[0];
uint32_t yscroll = scrollregs[1];
Expand Down Expand Up @@ -309,11 +309,11 @@ void spg_renderer_device::draw_linemap(bool has_extended_tilemaps, const rectang
{
bits <<= nc_bpp;
if (nbits < nc_bpp)
{
{
uint16_t b = spc.read_word(sourcebase++ & 0x3fffff);
b = (b << 8) | (b >> 8);
bits |= b << (nc_bpp - nbits);
nbits += 16;
nbits += 16;
}
nbits -= nc_bpp;

Expand Down
Loading

0 comments on commit 587598e

Please sign in to comment.