diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/timekpr.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/timekpr.cpp')
| -rw-r--r-- | src/devices/machine/timekpr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index 940fa84f259..ccd849ef21d 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -61,12 +61,12 @@ const device_type MK48T08 = &device_creator<mk48t08_device>; INLINE FUNCTIONS ***************************************************************************/ -INLINE UINT8 make_bcd(UINT8 data) +static inline UINT8 make_bcd(UINT8 data) { return ( ( ( data / 10 ) % 10 ) << 4 ) + ( data % 10 ); } -INLINE UINT8 from_bcd( UINT8 data ) +static inline UINT8 from_bcd( UINT8 data ) { return ( ( ( data >> 4 ) & 15 ) * 10 ) + ( data & 15 ); } @@ -215,7 +215,7 @@ void timekeeper_device::device_start() system_time systime; /* validate some basic stuff */ - assert(this != NULL); + assert(this != nullptr); machine().base_datetime(systime); @@ -398,7 +398,7 @@ READ8_MEMBER( timekeeper_device::read ) void timekeeper_device::nvram_default() { - if( m_default_data != NULL ) + if( m_default_data != nullptr ) { memcpy( &m_data[0], m_default_data, m_size ); } |
