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

Merge pull request #2797 from jfdelnero/master

Browse Source 
Fix logs, typos, and memset replaced by std::fill.
This commit is contained in:
R. Belmont 2017-11-13 08:57:01 -05:00 committed by GitHub
commit 83afccdd6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 121 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/devices/machine/smc91c9x.cpp
View File

@ -140,12 +140,13 @@ void smc91c9x_device::device_reset()
unsigned char i;
const unsigned char * mac;
memset(m_reg, 0, sizeof(m_reg));
std::fill(m_reg, m_reg + sizeof(m_reg), 0);
memset(m_rx, 0, sizeof(m_rx));
memset(m_tx, 0, sizeof(m_tx));
std::fill(m_rx, m_rx + sizeof(m_rx), 0);
std::fill(m_tx, m_tx + sizeof(m_tx), 0);
std::fill(m_regmask, m_regmask + sizeof(m_regmask), 0);
memset(m_regmask, 0, sizeof(m_regmask));
m_irq_state = 0;
m_alloc_count = 0;
rx_fifo_out = 0;
@ -168,7 +169,7 @@ void smc91c9x_device::device_reset()
{
logerror("%.2X",mac[i]);
}
logerror("\r\n");
logerror("\n");
}
set_promisc(true);
@ -216,6 +217,7 @@ void smc91c9x_device::device_reset()
update_ethernet_irq();
}
DEFINE_DEVICE_TYPE(SMC91C94, smc91c94_device, "smc91c94", "SMC91C94 Ethernet Controller")
smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@ -234,14 +236,14 @@ void smc91c9x_device::clear_tx_fifo()
{
tx_fifo_in = 0;
tx_fifo_out = 0;
memset(m_tx, 0, sizeof(m_tx));
std::fill(m_tx, m_tx + sizeof(m_tx), 0);
}
void smc91c9x_device::clear_rx_fifo()
{
rx_fifo_in = 0;
rx_fifo_out = 0;
memset(m_rx, 0, sizeof(m_rx));
std::fill(m_rx, m_rx + sizeof(m_rx), 0);
}
int smc91c9x_device::is_broadcast(uint8_t mac_address[])
@ -271,7 +273,7 @@ int smc91c9x_device::ethernet_packet_is_for_me(const uint8_t mac_address[])
uint8_t local_address[ETHERNET_ADDR_SIZE];
if ( LOG_ETHERNET )
logerror("\r\n");
logerror("\n");
local_address[0] = (m_reg[EREG_IA0_1]>>0) & 0xFF;
local_address[1] = (m_reg[EREG_IA0_1]>>8) & 0xFF;
@ -298,19 +300,19 @@ int smc91c9x_device::ethernet_packet_is_for_me(const uint8_t mac_address[])
if ( is_broadcast((uint8_t *)mac_address) )
{
if ( LOG_ETHERNET )
logerror(" -- Broadcast rx\r\n");
logerror(" -- Broadcast rx\n");
return 2;
}
if (memcmp(mac_address, local_address, ETHERNET_ADDR_SIZE) == 0)
{
if ( LOG_ETHERNET )
logerror(" -- Address Match\r\n");
logerror(" -- Address Match\n");
return 1;
}
if ( LOG_ETHERNET )
logerror(" -- Not Matching\r\n");
logerror(" -- Not Matching\n");
return 0;
}
@ -325,7 +327,7 @@ void smc91c9x_device::recv_cb(uint8_t *data, int length)
int isforme,i,dst;
if ( LOG_ETHERNET )
logerror("recv_cb : %d/0x%x\r\n",length,length);
logerror("recv_cb : %d/0x%x\n",length,length);
isforme = ethernet_packet_is_for_me( data );
@ -344,13 +346,13 @@ void smc91c9x_device::recv_cb(uint8_t *data, int length)
logerror("%.2X",data[ETHERNET_ADDR_SIZE+i]);
}
logerror(" - IsForMe %d - %d/0x%x bytes\r\n",isforme,length,length);
logerror(" - IsForMe %d - %d/0x%x bytes\n",isforme,length,length);
}
if ( (length < ETHERNET_ADDR_SIZE || !isforme) && !(m_reg[EREG_RCR] & 0x0100) )
{
if ( LOG_ETHERNET )
logerror("\r\n");
logerror("\n");
// skip packet
return;
}
@ -363,7 +365,7 @@ void smc91c9x_device::recv_cb(uint8_t *data, int length)
{
packet = &m_rx[ ( rx_fifo_in & ( ETHER_RX_BUFFERS - 1 ) ) * ETHER_BUFFER_SIZE];
memset(packet,0x00,ETHER_BUFFER_SIZE);
std::fill(packet, packet + ETHER_BUFFER_SIZE, 0);
dst = 0;
@ -371,6 +373,7 @@ void smc91c9x_device::recv_cb(uint8_t *data, int length)
// Status word
packet[dst++] = 0x00;
// set the broadcast flag
if ( isforme == 2 )
packet[dst++] |= 0x40;
@ -415,7 +418,7 @@ void smc91c9x_device::recv_cb(uint8_t *data, int length)
update_ethernet_irq();
if ( LOG_ETHERNET )
logerror("\r\n");
logerror("\n");
}
/***************************************************************************
@ -500,7 +503,7 @@ int smc91c9x_device::send_frame()
logerror("%.2X",tx_buffer[4+ETHERNET_ADDR_SIZE+i]);
}
logerror("--- %d/0x%x bytes\r\n",buffer_len,buffer_len);
logerror("--- %d/0x%x bytes\n",buffer_len,buffer_len);
}
if ( buffer_len > 4 )
@ -517,7 +520,7 @@ int smc91c9x_device::send_frame()
if ( !send(&tx_buffer[4], buffer_len-4) )
{
// FIXME: failed to send the Ethernet packet
//logerror("failed to send Ethernet packet\r\n");
//logerror("failed to send Ethernet packet\n");
//LOG(this,("read_command_port(): !!! failed to send Ethernet packet"));
}
}
@ -720,7 +723,7 @@ READ16_MEMBER( smc91c9x_device::read )
}
if ( LOG_ETHERNET && offset != EREG_BANK )
logerror("%s:smc91c9x_r(%s) = %04X & %04X\n", (machine().describe_context()).c_str(), ethernet_regname[offset], result, mem_mask);
logerror("%s:smc91c9x_r(%s) = %04X & %04X\n", machine().describe_context(), ethernet_regname[offset], result, mem_mask);
return result;
}
@ -739,7 +742,7 @@ WRITE16_MEMBER( smc91c9x_device::write )
/* update the data generically */
if ( LOG_ETHERNET && offset != 7 && offset < sizeof(m_reg) )
logerror("%s:smc91c9x_w(%s) = [%04X]<-%04X & (%04X & %04X)\n", (machine().describe_context()).c_str(), ethernet_regname[offset], offset, data, mem_mask , m_regmask[offset]);
logerror("%s:smc91c9x_w(%s) = [%04X]<-%04X & (%04X & %04X)\n", machine().describe_context(), ethernet_regname[offset], offset, data, mem_mask , m_regmask[offset]);
mem_mask &= m_regmask[offset];
COMBINE_DATA(&m_reg[offset]);