diff options
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/clifront.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68k_in.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68kmmu.h | 6 | ||||
-rw-r--r-- | src/emu/emuopts.c | 2 | ||||
-rw-r--r-- | src/emu/hash.c | 30 | ||||
-rw-r--r-- | src/emu/machine/idectrl.c | 18 | ||||
-rw-r--r-- | src/emu/machine/idectrl.h | 12 | ||||
-rw-r--r-- | src/emu/machine/nscsi_bus.c | 6 | ||||
-rw-r--r-- | src/emu/machine/nscsi_bus.h | 6 | ||||
-rw-r--r-- | src/emu/machine/nscsi_hd.c | 2 | ||||
-rw-r--r-- | src/emu/romload.c | 22 | ||||
-rw-r--r-- | src/emu/sound/samples.c | 38 | ||||
-rw-r--r-- | src/emu/sound/samples.h | 16 | ||||
-rw-r--r-- | src/emu/sound/votrax.c | 22 | ||||
-rw-r--r-- | src/emu/sound/votrax.h | 4 | ||||
-rw-r--r-- | src/emu/video/pc_vga.c | 8 |
16 files changed, 100 insertions, 100 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 9a1b23554e2..35f4e51372f 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -1457,9 +1457,9 @@ void media_identifier::identify(const char *filename) // crude, need real UTF16->UTF8 conversion ideally for (int j=0;j<namelen;j++) { - temp3[j] = (UINT8)temp[j]; + temp3[j] = (UINT8)temp[j]; } - + if (!(f->IsDir) && (f->Size != 0)) { UINT8 *data = global_alloc_array(UINT8, f->Size); diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index fd5e742a55d..2d0a2bd9bf6 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -10485,8 +10485,8 @@ M68KMAKE_OP(cinv, 32, ., .) { UINT16 ir = mc68kcpu->ir; UINT8 cache = (ir >> 6) & 3; -// UINT8 scope = (ir >> 3) & 3; -// logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7); +// UINT8 scope = (ir >> 3) & 3; +// logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7); switch (cache) { case 2: diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/emu/cpu/m68000/m68kmmu.h index 19e7442b4c5..8a961bfb6b0 100644 --- a/src/emu/cpu/m68000/m68kmmu.h +++ b/src/emu/cpu/m68000/m68kmmu.h @@ -610,11 +610,11 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 fc, U static UINT32 psrp = 0, purp=0; if(psrp != m68k->mmu_srp_aptr) { psrp = m68k->mmu_srp_aptr; -// fprintf(stderr, "srp = %08x\n", psrp); +// fprintf(stderr, "srp = %08x\n", psrp); } if(purp != m68k->mmu_urp_aptr) { purp = m68k->mmu_urp_aptr; -// fprintf(stderr, "urp = %08x\n", purp); +// fprintf(stderr, "urp = %08x\n", purp); } // is UDT marked valid? @@ -791,7 +791,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) } else if ((m68k->ir & 0xffe0) == 0xf500) { -// logerror("68040 pflush: pc=%08x ir=%04x opmode=%d register=%d\n", REG_PPC(m68k), m68k->ir, (m68k->ir >> 3) & 3, m68k->ir & 7); +// logerror("68040 pflush: pc=%08x ir=%04x opmode=%d register=%d\n", REG_PPC(m68k), m68k->ir, (m68k->ir >> 3) & 3, m68k->ir & 7); pmmu_atc_flush(m68k); } else // the rest are 1111000xxxXXXXXX where xxx is the instruction family diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 50b2ca3ea66..ddea3ecdf9e 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -375,7 +375,7 @@ bool emu_options::parse_slot_devices(int argc, char *argv[], astring &error_stri result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); update_slot_options(); while (add_slot_options(false)); - add_device_options(true); + add_device_options(true); result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); return result; } diff --git a/src/emu/hash.c b/src/emu/hash.c index 5a00308cd7b..9d03e5cf9ba 100644 --- a/src/emu/hash.c +++ b/src/emu/hash.c @@ -179,7 +179,7 @@ bool hash_collection::add_from_string(char type, const char *buffer, int length) // handle CRCs if (type == HASH_CRC) return m_has_crc32 = m_crc32.from_string(buffer, length); - + // handle SHA1s else if (type == HASH_SHA1) return m_has_sha1 = m_sha1.from_string(buffer, length); @@ -195,14 +195,14 @@ bool hash_collection::add_from_string(char type, const char *buffer, int length) bool hash_collection::remove(char type) { bool result = false; - + // handle CRCs if (type == HASH_CRC) { result = m_has_crc32; m_has_crc32 = false; } - + // handle SHA1s else if (type == HASH_SHA1) { @@ -222,12 +222,12 @@ bool hash_collection::remove(char type) const char *hash_collection::internal_string(astring &buffer) const { buffer.reset(); - + // handle CRCs astring temp; if (m_has_crc32) buffer.cat(HASH_CRC).cat(m_crc32.as_string(temp)); - + // handle SHA1s if (m_has_sha1) buffer.cat(HASH_SHA1).cat(m_sha1.as_string(temp)); @@ -250,7 +250,7 @@ const char *hash_collection::macro_string(astring &buffer) const astring temp; if (m_has_crc32) buffer.cat("CRC(").cat(m_crc32.as_string(temp)).cat(") "); - + // handle SHA1s if (m_has_sha1) buffer.cat("SHA1(").cat(m_sha1.as_string(temp)).cat(") "); @@ -277,7 +277,7 @@ const char *hash_collection::attribute_string(astring &buffer) const astring temp; if (m_has_crc32) buffer.cat("crc=\"").cat(m_crc32.as_string(temp)).cat("\" "); - + // handle SHA1s if (m_has_sha1) buffer.cat("sha1=\"").cat(m_sha1.as_string(temp)).cat("\" "); @@ -352,7 +352,7 @@ void hash_collection::begin(const char *types) // by default use all types if (types == NULL) m_creator->m_doing_crc32 = m_creator->m_doing_sha1 = true; - + // otherwise, just allocate the ones that are specified else { @@ -369,7 +369,7 @@ void hash_collection::begin(const char *types) void hash_collection::buffer(const UINT8 *data, UINT32 length) { assert(m_creator != NULL); - + // append to each active hash if (m_creator->m_doing_crc32) m_creator->m_crc32_creator.append(data, length); @@ -385,24 +385,24 @@ void hash_collection::buffer(const UINT8 *data, UINT32 length) void hash_collection::end() { assert(m_creator != NULL); - + // default to getting nothing m_has_crc32 = m_has_sha1 = false; - + // finish up the CRC32 if (m_creator->m_doing_crc32) { m_has_crc32 = true; m_crc32 = m_creator->m_crc32_creator.finish(); } - + // finish up the SHA1 if (m_creator->m_doing_sha1) { m_has_sha1 = true; m_sha1 = m_creator->m_sha1_creator.finish(); } - + // nuke the creator delete m_creator; m_creator = NULL; @@ -418,13 +418,13 @@ void hash_collection::copyfrom(const hash_collection &src) { // copy flags directly m_flags = src.m_flags; - + // copy hashes m_has_crc32 = src.m_has_crc32; m_crc32 = src.m_crc32; m_has_sha1 = src.m_has_sha1; m_sha1 = src.m_sha1; - // don't copy creators + // don't copy creators m_creator = NULL; } diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 52cc6251b4d..c52272c064f 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -921,7 +921,7 @@ static void write_sector_done(ide_state *ide) /* now do the write */ if (ide->drive[ide->cur_drive].slot) { count = ide->drive[ide->cur_drive].slot->write_sector(lba, ide->buffer); - } + } /* by default, mark the buffer ready and the seek complete */ ide->status |= IDE_STATUS_BUFFER_READY; @@ -1174,7 +1174,7 @@ static void handle_command(ide_state *ide, UINT8 command) ide->status &= ~IDE_STATUS_ERROR; ide->error = IDE_ERROR_NONE; ide->drive[ide->cur_drive].slot->set_geometry(ide->sector_count,ide->drive[ide->cur_drive].cur_head + 1); - + /* signal an interrupt */ signal_delayed_interrupt(ide, MINIMUM_COMMAND_TIME, 0); break; @@ -1921,7 +1921,7 @@ static DEVICE_START( ide_controller ) static DEVICE_RESET( ide_controller ) { ide_state *ide = get_safe_token(device); - LOG(("IDE controller reset performed\n")); + LOG(("IDE controller reset performed\n")); /* reset the drive state */ ide->cur_drive = 0; ide->status = IDE_STATUS_DRIVE_READY | IDE_STATUS_SEEK_COMPLETE; @@ -1938,7 +1938,7 @@ SLOT_INTERFACE_START(ide_image_devices) SLOT_INTERFACE_END SLOT_INTERFACE_START(ide_devices) - SLOT_INTERFACE("hdd", IDE_HARDDISK) + SLOT_INTERFACE("hdd", IDE_HARDDISK) SLOT_INTERFACE_END /*------------------------------------------------- @@ -2060,7 +2060,7 @@ void ide_hdd_device::device_reset() { m_handle = get_disk_handle(machine(), owner()->tag()); m_disk = hard_disk_open(m_handle); - + if (m_disk != NULL) { const hard_disk_info *hdinfo = hard_disk_get_info(m_disk); @@ -2072,11 +2072,11 @@ void ide_hdd_device::device_reset() if (PRINTF_IDE_COMMANDS) mame_printf_debug("CHS: %d %d %d\n", m_num_cylinders, m_num_heads, m_num_sectors); mame_printf_debug("CHS: %d %d %d\n", m_num_cylinders, m_num_heads, m_num_sectors); } - // build the features page + // build the features page UINT32 metalength; if (m_handle->read_metadata (HARD_DISK_IDENT_METADATA_TAG, 0, m_features, IDE_DISK_SECTOR_SIZE, metalength) != CHDERR_NONE) ide_build_features(); - } + } } //------------------------------------------------- @@ -2137,7 +2137,7 @@ void ide_hdd_image_device::device_reset() m_num_heads = hdinfo->heads; if (PRINTF_IDE_COMMANDS) printf("CHS: %d %d %d\n", m_num_cylinders, m_num_heads, m_num_sectors); } - // build the features page + // build the features page UINT32 metalength; if (m_handle->read_metadata (HARD_DISK_IDENT_METADATA_TAG, 0, m_features, IDE_DISK_SECTOR_SIZE, metalength) != CHDERR_NONE) ide_build_features(); @@ -2152,7 +2152,7 @@ void ide_hdd_image_device::device_reset() //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( hdd_image ) MCFG_HARDDISK_ADD( "harddisk" ) -MACHINE_CONFIG_END +MACHINE_CONFIG_END machine_config_constructor ide_hdd_image_device::device_mconfig_additions() const { diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index 47c92ac511b..ae5ca6c52bb 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -33,8 +33,8 @@ public: public: virtual int read_sector(UINT32 lba, void *buffer) = 0; virtual int write_sector(UINT32 lba, const void *buffer) = 0; - - UINT8 *get_features() { return m_features;} + + UINT8 *get_features() { return m_features;} UINT16 get_cylinders() { return m_num_cylinders; } UINT16 get_sectors() { return m_num_sectors; } @@ -59,12 +59,12 @@ public: ide_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); int read_sector(UINT32 lba, void *buffer) { return (m_dev) ? m_dev->read_sector(lba,buffer) : 0; } - int write_sector(UINT32 lba, const void *buffer) { return (m_dev) ? m_dev->write_sector(lba,buffer) : 0; } - UINT8 *get_features() { return (m_dev) ? m_dev->get_features() : NULL;} + int write_sector(UINT32 lba, const void *buffer) { return (m_dev) ? m_dev->write_sector(lba,buffer) : 0; } + UINT8 *get_features() { return (m_dev) ? m_dev->get_features() : NULL;} UINT16 get_cylinders() { return (m_dev) ? m_dev->get_cylinders() : 0; } UINT16 get_sectors() { return (m_dev) ? m_dev->get_sectors() : 0; } - UINT16 get_heads() { return (m_dev) ? m_dev->get_heads() : 0; } + UINT16 get_heads() { return (m_dev) ? m_dev->get_heads() : 0; } void set_geometry(UINT8 sectors, UINT8 heads) { if (m_dev) m_dev->set_geometry(sectors,heads); } bool is_ready() { return (m_dev) ? m_dev->is_ready() : false; } void read_key(UINT8 key[]) { if (m_dev) m_dev->read_key(key); } @@ -96,7 +96,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + void ide_build_features(); virtual bool is_ready() { return (m_disk != NULL); } protected: diff --git a/src/emu/machine/nscsi_bus.c b/src/emu/machine/nscsi_bus.c index dc11575af82..816d7e26010 100644 --- a/src/emu/machine/nscsi_bus.c +++ b/src/emu/machine/nscsi_bus.c @@ -68,7 +68,7 @@ void nscsi_bus_device::regen_ctrl(int refid) } logerror("\n"); } - + octrl = octrl ^ ctrl; if(octrl) for(int i=0; i<devcnt; i++) @@ -357,7 +357,7 @@ void nscsi_full_device::step(bool timeout) } else target_recv_byte(); break; - + default: logerror("%s: step() unexpected state %d.%d\n", tag(), @@ -442,7 +442,7 @@ nscsi_full_device::control *nscsi_full_device::buf_control_pop() buf_control_rpos++; if(buf_control_rpos == buf_control_wpos) buf_control_rpos = buf_control_wpos = 0; - return c; + return c; } void nscsi_full_device::scsi_status_complete(UINT8 st) diff --git a/src/emu/machine/nscsi_bus.h b/src/emu/machine/nscsi_bus.h index ea34ad0cbe9..989bd95a965 100644 --- a/src/emu/machine/nscsi_bus.h +++ b/src/emu/machine/nscsi_bus.h @@ -7,7 +7,7 @@ MCFG_DEVICE_ADD(_tag, NSCSI_BUS, 0) #define MCFG_NSCSI_DEVICE_ADD(_tag, _subtag, _type, _clock) \ - MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ + MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ downcast<nscsi_connector *>(device)->set_fixed_device(_subtag); \ MCFG_DEVICE_ADD(_tag ":" _subtag, _type, _clock) @@ -15,7 +15,7 @@ MCFG_NSCSI_DEVICE_ADD(_tag, _subtag, _type, _clock) #define MCFG_NSCSI_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ - MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ + MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp) class nscsi_device; @@ -336,7 +336,7 @@ private: control *buf_control_push(); control *buf_control_pop(); - + void step(bool timeout); void target_recv_byte(); void target_send_byte(UINT8 val); diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c index 61642ed0468..de93636180d 100644 --- a/src/emu/machine/nscsi_hd.c +++ b/src/emu/machine/nscsi_hd.c @@ -83,7 +83,7 @@ void nscsi_harddisk_device::scsi_command() bad_lun(); return; } - + int page = scsi_cmdbuf[2]; int size = scsi_cmdbuf[4]; switch(page) { diff --git a/src/emu/romload.c b/src/emu/romload.c index b8173ef9485..c51427f8366 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -456,13 +456,13 @@ static void dump_wrong_and_correct_checksums(rom_load_data *romdata, const hash_ romdata->errorstring.catprintf(" EXPECTED: %s\n", hashes.macro_string(tempstr)); romdata->errorstring.catprintf(" FOUND: %s\n", acthashes.macro_string(tempstr)); /* - // warn about any ill-formed hashes - for (hash_base *hash = hashes.first(); hash != NULL; hash = hash->next()) - if (hash->parse_error()) - { - romdata->errorstring.catprintf("\tInvalid %s checksum treated as 0 (check leading zeros)\n", hash->name()); - romdata->warnings++; - } + // warn about any ill-formed hashes + for (hash_base *hash = hashes.first(); hash != NULL; hash = hash->next()) + if (hash->parse_error()) + { + romdata->errorstring.catprintf("\tInvalid %s checksum treated as 0 (check leading zeros)\n", hash->name()); + romdata->warnings++; + } */ } @@ -1157,11 +1157,11 @@ static chd_error open_disk_diff(emu_options &options, const rom_entry *romp, chd { astring fullpath(diff_file.fullpath()); diff_file.close(); - + LOG(("Opening differencing image file: %s\n", fullpath.cstr())); return diff_chd.open(fullpath, true, &source); } - + /* didn't work; try creating it instead */ LOG(("Creating differencing image: %s\n", fname.cstr())); diff_file.set_openflags(OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); @@ -1177,7 +1177,7 @@ static chd_error open_disk_diff(emu_options &options, const rom_entry *romp, chd chd_error err = diff_chd.create(fullpath, source.logical_bytes(), source.hunk_bytes(), compression, source); if (err != CHDERR_NONE) return err; - + return diff_chd.clone_all_metadata(source); } @@ -1199,7 +1199,7 @@ static void process_disk_entries(rom_load_data *romdata, const char *regiontag, if (ROMENTRY_ISFILE(romp)) { open_chd *chd = global_alloc(open_chd(regiontag)); - + hash_collection hashes(ROM_GETHASHDATA(romp)); chd_error err; diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c index c5aeffaf518..055f4204450 100644 --- a/src/emu/sound/samples.c +++ b/src/emu/sound/samples.c @@ -6,17 +6,17 @@ **************************************************************************** - Playback of pre-recorded samples. Used for high-level simulation of - discrete sound circuits where proper low-level simulation isn't - available. Also used for tape loops and similar. + Playback of pre-recorded samples. Used for high-level simulation of + discrete sound circuits where proper low-level simulation isn't + available. Also used for tape loops and similar. - Current limitations - - Only supports single channel samples! + Current limitations + - Only supports single channel samples! - Considerations - - Maybe this should be part of the presentation layer - (artwork etc.) with samples specified in .lay files instead of - in drivers? + Considerations + - Maybe this should be part of the presentation layer + (artwork etc.) with samples specified in .lay files instead of + in drivers? **************************************************************************** @@ -135,7 +135,7 @@ void samples_device::start(UINT8 channel, UINT32 samplenum, bool loop) //------------------------------------------------- -// start_raw - start playing an externally +// start_raw - start playing an externally // provided sample //------------------------------------------------- @@ -249,7 +249,7 @@ UINT32 samples_device::base_frequency(UINT8 channel) const //------------------------------------------------- // playing - return true if a sample is still -// playing on the given channel +// playing on the given channel //------------------------------------------------- bool samples_device::playing(UINT8 channel) const @@ -318,7 +318,7 @@ void samples_device::device_reset() //------------------------------------------------- // device_post_load - handle updating after a -// restore +// restore //------------------------------------------------- void samples_device::device_post_load() @@ -422,7 +422,7 @@ void samples_device::sound_stream_update(sound_stream &stream, stream_sample_t * //************************************************************************** //------------------------------------------------- -// read_sample - read a WAV or FLAC file as a +// read_sample - read a WAV or FLAC file as a // sample //------------------------------------------------- @@ -436,7 +436,7 @@ bool samples_device::read_sample(emu_file &file, loaded_sample &sample) mame_printf_warning("Unable to read %s, 0-byte file?\n", file.filename()); return false; } - + // look for the appropriate RIFF tag if (memcmp(&buf[0], "RIFF", 4) == 0) return read_wav_sample(file, sample); @@ -458,7 +458,7 @@ bool samples_device::read_wav_sample(emu_file &file, loaded_sample &sample) printf("Reading %s as WAV\n", file.filename()); // we already read the opening 'WAVE' header UINT32 offset = 4; - + // get the total size UINT32 filesize; offset += file.read(&filesize, 4); @@ -593,12 +593,12 @@ printf("Reading %s as FLAC\n", file.filename()); return false; if (decoder.bits_per_sample() != 16) return false; - + // resize the array and read sample.data.resize(sample.length); if (!decoder.decode_interleaved(sample.data, sample.length)) return false; - + // finish up and clean up decoder.finish(); return true; @@ -615,7 +615,7 @@ void samples_device::load_samples() // if the user doesn't want to use samples, bail if (!machine().options().samples()) return; - + // iterate over ourself const char *basename = machine().basename(); samples_iterator iter(*this); @@ -634,7 +634,7 @@ printf("Sample %d = %s\n", index, samplename); file_error filerr = file.open(basename, PATH_SEPARATOR, samplename, ".flac"); if (filerr != FILERR_NONE && altbasename != NULL) filerr = file.open(altbasename, PATH_SEPARATOR, samplename, ".flac"); - + // if not, try as WAV if (filerr != FILERR_NONE) filerr = file.open(basename, PATH_SEPARATOR, samplename, ".wav"); diff --git a/src/emu/sound/samples.h b/src/emu/sound/samples.h index 8aee978a86a..b9acbaea729 100644 --- a/src/emu/sound/samples.h +++ b/src/emu/sound/samples.h @@ -79,7 +79,7 @@ struct samples_interface // ======================> samples_device -class samples_device : public device_t, +class samples_device : public device_t, public device_sound_interface, public samples_interface { @@ -100,11 +100,11 @@ public: void pause(UINT8 channel, bool pause = true); void stop(UINT8 channel); void stop_all(); - + // dynamic control void set_frequency(UINT8 channel, UINT32 frequency); void set_volume(UINT8 channel, float volume); - + protected: // subclasses can do it this way samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); @@ -123,7 +123,7 @@ private: { // shouldn't need a copy, but in case it happens, catch it here loaded_sample &operator=(const loaded_sample &rhs) { assert(false); return *this; } - + UINT32 length; // length in samples UINT32 frequency; // frequency of the sample dynamic_array<INT16> data; // 16-bit signed data @@ -142,7 +142,7 @@ private: bool loop; bool paused; }; - + // internal helpers bool read_sample(emu_file &file, loaded_sample &sample); bool read_wav_sample(emu_file &file, loaded_sample &sample); @@ -172,7 +172,7 @@ public: samples_iterator(samples_interface &intf) : m_intf(intf), m_current(-1) { } - + // getters const char *altbasename() const { return (m_intf.m_names != NULL && m_intf.m_names[0] != NULL && m_intf.m_names[0][0] == '*') ? &m_intf.m_names[0][1] : NULL; } @@ -181,7 +181,7 @@ public: { if (m_intf.m_names == NULL || m_intf.m_names[0] == NULL) return NULL; - m_current = 0; + m_current = 0; if (m_intf.m_names[0][0] == '*') m_current++; return m_intf.m_names[m_current++]; @@ -193,7 +193,7 @@ public: return NULL; return m_intf.m_names[m_current++]; } - + // counting int count() { diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c index f4d0abb0a8c..4f8e146c6ee 100644 --- a/src/emu/sound/votrax.c +++ b/src/emu/sound/votrax.c @@ -52,14 +52,14 @@ const device_type VOTRAX = &device_creator<votrax_device>; const char *const votrax_device::s_phoneme_table[64] = { - "EH3", "EH2", "EH1", " "/*PA0*/"DT", "A1", "A2", "ZH", - "AH2", "I3", "I2", "I1", "M", "N", "B", "V", - "CH", "SH", "Z", "AW1", "NG", "AH1", "OO1", "OO", - "L", "K", "J", "H", "G", "F", "D", "S", - "A", "AY", "Y1", "UH3", "AH", "P", "O", "I", - "U", "Y", "T", "R", "E", "W", "AE", "AE1", - "AW2", "UH2", "UH1", "UH", "O2", "O1", "IU", "U1", - "THV", "TH", "ER", "EH", "E1", "AW", " "/*PA1*/, "."/*STOP*/ + "EH3", "EH2", "EH1", " "/*PA0*/"DT", "A1", "A2", "ZH", + "AH2", "I3", "I2", "I1", "M", "N", "B", "V", + "CH", "SH", "Z", "AW1", "NG", "AH1", "OO1", "OO", + "L", "K", "J", "H", "G", "F", "D", "S", + "A", "AY", "Y1", "UH3", "AH", "P", "O", "I", + "U", "Y", "T", "R", "E", "W", "AE", "AE1", + "AW2", "UH2", "UH1", "UH", "O2", "O1", "IU", "U1", + "THV", "TH", "ER", "EH", "E1", "AW", " "/*PA1*/, "."/*STOP*/ }; @@ -103,7 +103,7 @@ WRITE8_MEMBER( votrax_device::write ) { // append to the current string m_current.cat(s_phoneme_table[data & 0x3f]); - + // look for a match in our sample table for (int index = 0; m_votrax_map[index].phoneme != NULL; index++) if (m_current.find(m_votrax_map[index].phoneme) != -1) @@ -117,7 +117,7 @@ WRITE8_MEMBER( votrax_device::write ) m_current.reset(); return; } - + // if we got a stop and didn't find a match, print it if ((data & 0x3f) == 0x3f) { @@ -157,7 +157,7 @@ void votrax_device::device_start() m_channels = 1; m_names = m_sample_list; m_start = NULL; - + // let the samples device do the rest samples_device::device_start(); } diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h index fb549ca6ee4..ffde9eeabdd 100644 --- a/src/emu/sound/votrax.h +++ b/src/emu/sound/votrax.h @@ -76,7 +76,7 @@ struct votrax_interface // ======================> votrax_device -class votrax_device : public samples_device, +class votrax_device : public samples_device, public votrax_interface { public: @@ -89,7 +89,7 @@ public: // writers DECLARE_WRITE8_MEMBER( write ); DECLARE_READ_LINE_MEMBER( status ); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index ac0f0cc71b4..e32b7ee4931 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -1072,8 +1072,8 @@ static void recompute_params(running_machine &machine) static void crtc_reg_write(running_machine &machine, UINT8 index, UINT8 data) { /* Doom does this */ -// if(vga.crtc.protect_enable && index <= 0x07) -// printf("write to protected address %02x\n",index); +// if(vga.crtc.protect_enable && index <= 0x07) +// printf("write to protected address %02x\n",index); switch(index) { @@ -1260,7 +1260,7 @@ static UINT8 vga_vblank(running_machine &machine) res = 1; } -// popmessage("%d %d %d",vblank_start,vblank_end,vga.crtc.vert_total); +// popmessage("%d %d %d",vblank_start,vblank_end,vga.crtc.vert_total); return res; } @@ -2234,7 +2234,7 @@ WRITE8_HANDLER(tseng_et4k_03d0_w) vga.crtc.data[vga.crtc.index] = data; tseng_crtc_reg_write(space->machine(),vga.crtc.index,data); //if((vga.crtc.index & 0xfe) != 0x0e) - // printf("%02x %02x %d\n",vga.crtc.index,data,space->machine().primary_screen->vpos()); + // printf("%02x %02x %d\n",vga.crtc.index,data,space->machine().primary_screen->vpos()); break; case 8: et4k.reg_3d8 = data; |