Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix build with clang, clean up some random stuff (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-04-07 17:22:19 +10:00
parent 6c27623726
commit 7cc3923831
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/sega8/sega8_slot.h
View File

@ -162,7 +162,7 @@ protected:
virtual void device_start() override;
int m_type;
bool m_is_card;
bool const m_is_card;
device_sega8_cart_interface* m_cart;
};

2
src/mame/drivers/cgc7900.cpp
View File

@ -235,7 +235,7 @@ WRITE16_MEMBER( cgc7900_state::interrupt_mask_w )
void cgc7900_state::cpu_space_map(address_map &map)
{
map(0xfffff2, 0xffffff).lr16("interrupt", [this](offs_t offset) -> u16 { return int_vectors[offset+1]; });
map(0xfffff2, 0xffffff).lr16("interrupt", [] (offs_t offset) -> u16 { return int_vectors[offset+1]; });
}
void cgc7900_state::irq_encoder(int pin, int state)

23
src/tools/imgtool/modules/rt11.cpp
View File

@ -573,19 +573,19 @@ static imgtoolerr_t rt11_lookup_path(imgtool::image &image, const char *path,
creation_policy_t create, rt11_direnum *direnum, rt11_dirent *rt_ent)
{
imgtoolerr_t err;
rt11_direnum my_direnum;
uint16_t this_segment;
uint32_t this_index;
char filename[16];
rt11_direnum my_direnum;
if (!direnum)
direnum = &my_direnum;
memset(direnum, 0, sizeof(*direnum));
err = rt11_enum_seek(image, direnum, 1, 0);
if (err)
goto done;
return err;
uint16_t this_segment;
uint32_t this_index;
char filename[16];
do
{
this_segment = direnum->segment;
@ -593,7 +593,7 @@ static imgtoolerr_t rt11_lookup_path(imgtool::image &image, const char *path,
err = rt11_get_next_dirent(image, direnum, *rt_ent);
if (err)
goto done;
return err;
rt11_filename_from_rad50(filename, rt_ent->filename);
}
while(direnum->segment && (strcmp(path, filename) ||
@ -603,22 +603,17 @@ static imgtoolerr_t rt11_lookup_path(imgtool::image &image, const char *path,
{
/* did not find file; maybe we need to create it */
if (create == CREATE_NONE)
{
err = IMGTOOLERR_FILENOTFOUND;
goto done;
}
return IMGTOOLERR_FILENOTFOUND;
}
else
{
/* we've found the file; seek that dirent */
err = rt11_enum_seek(image, direnum, this_segment, this_index);
if (err)
goto done;
return err;
}
err = IMGTOOLERR_SUCCESS;
done:
return err;
return IMGTOOLERR_SUCCESS;
}
static imgtoolerr_t rt11_read_bootblock(imgtool::partition &partition, imgtool::stream &stream)