From 60f827ef0c2ea9dc4668406038b53c13aeb315ed Mon Sep 17 00:00:00 2001 From: hap Date: Thu, 22 Aug 2024 11:08:50 +0200 Subject: tms5x: rename extract_bits to read_bits --- src/devices/sound/tms5110.cpp | 16 ++++++++-------- src/devices/sound/tms5110.h | 2 +- src/devices/sound/tms5220.cpp | 16 ++++++++-------- src/devices/sound/tms5220.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 42899a0ac4d..bc08ea2a18d 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -277,11 +277,11 @@ static void printbits(long data, int num) /****************************************************************************************** - extract_bits -- extract a specific number of bits from the VSM + read_bits -- read a specific number of bits from the VSM ******************************************************************************************/ -int tms5110_device::extract_bits(int count) +int tms5110_device::read_bits(int count) { int val = 0; if (DEBUG_5110) logerror("requesting %d bits", count); @@ -846,7 +846,7 @@ void tms5110_device::PDC_set(int data) fprintf(stderr,"actually reading a bit now\n"); #endif m_CTL_buffer >>= 1; - m_CTL_buffer |= (extract_bits(1)<<3); + m_CTL_buffer |= (read_bits(1)<<3); m_CTL_buffer &= 0xF; } break; @@ -924,7 +924,7 @@ void tms5110_device::parse_frame() m_uv_zpar = m_zpar = 0; // attempt to extract the energy index - m_new_frame_energy_idx = extract_bits(m_coeff->energy_bits); + m_new_frame_energy_idx = read_bits(m_coeff->energy_bits); #ifdef DEBUG_PARSE_FRAME_DUMP printbits(m_new_frame_energy_idx,m_coeff->energy_bits); fprintf(stderr," "); @@ -934,13 +934,13 @@ void tms5110_device::parse_frame() if ((m_new_frame_energy_idx == 0) || (m_new_frame_energy_idx == 15)) return; - rep_flag = extract_bits(1); + rep_flag = read_bits(1); #ifdef DEBUG_PARSE_FRAME_DUMP printbits(rep_flag, 1); fprintf(stderr," "); #endif - m_new_frame_pitch_idx = extract_bits(m_coeff->pitch_bits); + m_new_frame_pitch_idx = read_bits(m_coeff->pitch_bits); #ifdef DEBUG_PARSE_FRAME_DUMP printbits(m_new_frame_pitch_idx,m_coeff->pitch_bits); fprintf(stderr," "); @@ -954,7 +954,7 @@ void tms5110_device::parse_frame() // extract first 4 K coefficients for (i = 0; i < 4; i++) { - m_new_frame_k_idx[i] = extract_bits(m_coeff->kbits[i]); + m_new_frame_k_idx[i] = read_bits(m_coeff->kbits[i]); #ifdef DEBUG_PARSE_FRAME_DUMP printbits(m_new_frame_k_idx[i],m_coeff->kbits[i]); fprintf(stderr," "); @@ -971,7 +971,7 @@ void tms5110_device::parse_frame() // If we got here, we need the remaining 6 K's for (i = 4; i < m_coeff->num_k; i++) { - m_new_frame_k_idx[i] = extract_bits(m_coeff->kbits[i]); + m_new_frame_k_idx[i] = read_bits(m_coeff->kbits[i]); #ifdef DEBUG_PARSE_FRAME_DUMP printbits(m_new_frame_k_idx[i],m_coeff->kbits[i]); fprintf(stderr," "); diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index 9d907668a70..c6e2a38900e 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -74,7 +74,7 @@ private: void new_int_write_addr(uint8_t addr); uint8_t new_int_read(); void register_for_save_states(); - int extract_bits(int count); + int read_bits(int count); void perform_dummy_read(); int32_t lattice_filter(); void process(int16_t *buffer, unsigned int size); diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index 77a7faeca76..79ffe28cee7 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -746,11 +746,11 @@ void tms5220_device::update_fifo_status_and_ints() /********************************************************************************************** - extract_bits -- extract a specific number of bits from the current input stream (FIFO or VSM) + read_bits -- read a specific number of bits from the current input stream (FIFO or VSM) ***********************************************************************************************/ -int tms5220_device::extract_bits(int count) +int tms5220_device::read_bits(int count) { int val = 0; @@ -1469,7 +1469,7 @@ void tms5220_device::parse_frame() has a 2 bit rate preceding it, grab two bits here and store them as the rate; */ if ((TMS5220_HAS_RATE_CONTROL) && (m_c_variant_rate & 0x04)) { - i = extract_bits(2); + i = read_bits(2); printbits(i, 2); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); m_IP = reload_table[i]; @@ -1481,7 +1481,7 @@ void tms5220_device::parse_frame() if (m_DDIS && m_buffer_empty) goto ranout; // attempt to extract the energy index - m_new_frame_energy_idx = extract_bits(m_coeff->energy_bits); + m_new_frame_energy_idx = read_bits(m_coeff->energy_bits); printbits(m_new_frame_energy_idx, m_coeff->energy_bits); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); update_fifo_status_and_ints(); @@ -1492,12 +1492,12 @@ void tms5220_device::parse_frame() // attempt to extract the repeat flag - rep_flag = extract_bits(1); + rep_flag = read_bits(1); printbits(rep_flag, 1); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); // attempt to extract the pitch - m_new_frame_pitch_idx = extract_bits(m_coeff->pitch_bits); + m_new_frame_pitch_idx = read_bits(m_coeff->pitch_bits); printbits(m_new_frame_pitch_idx, m_coeff->pitch_bits); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); // if the new frame is unvoiced, be sure to zero out the k5-k10 parameters @@ -1511,7 +1511,7 @@ void tms5220_device::parse_frame() // extract first 4 K coefficients for (i = 0; i < 4; i++) { - m_new_frame_k_idx[i] = extract_bits(m_coeff->kbits[i]); + m_new_frame_k_idx[i] = read_bits(m_coeff->kbits[i]); printbits(m_new_frame_k_idx[i], m_coeff->kbits[i]); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); update_fifo_status_and_ints(); @@ -1528,7 +1528,7 @@ void tms5220_device::parse_frame() // If we got here, we need the remaining 6 K's for (i = 4; i < m_coeff->num_k; i++) { - m_new_frame_k_idx[i] = extract_bits(m_coeff->kbits[i]); + m_new_frame_k_idx[i] = read_bits(m_coeff->kbits[i]); printbits(m_new_frame_k_idx[i], m_coeff->kbits[i]); LOGMASKED(LOG_PARSE_FRAME_DUMP_BIN | LOG_PARSE_FRAME_DUMP_HEX, " "); update_fifo_status_and_ints(); diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index 061df7b0266..f7ff1dcc091 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -89,7 +89,7 @@ private: void register_for_save_states(); void data_write(int data); void update_fifo_status_and_ints(); - int extract_bits(int count); + int read_bits(int count); uint8_t status_read(bool clear_int); bool ready_read(); bool int_read(); -- cgit v1.2.3