diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-28 22:21:57 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-28 22:21:57 -0400 |
commit | de20b819f1dc90c83a3050c9f26b89871f38779c (patch) | |
tree | 8ae4ed02eb5ae4b67aacc7adbdb600221ac22009 /src/dev/tsunami_io.cc | |
parent | 5df77b865ddc29a00629a679437dee2578997559 (diff) | |
download | gem5-de20b819f1dc90c83a3050c9f26b89871f38779c.tar.xz |
remove some getPtr() calls by changing having function return values
instead of taking a pointer
--HG--
extra : convert_revision : fd9092eaa726e91b501334d35d28dda28aaa01bd
Diffstat (limited to 'src/dev/tsunami_io.cc')
-rw-r--r-- | src/dev/tsunami_io.cc | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/dev/tsunami_io.cc b/src/dev/tsunami_io.cc index 7c649a84a..729a61cf7 100644 --- a/src/dev/tsunami_io.cc +++ b/src/dev/tsunami_io.cc @@ -118,25 +118,27 @@ TsunamiIO::RTC::writeData(const uint8_t data) } } -void -TsunamiIO::RTC::readData(uint8_t *data) +uint8_t +TsunamiIO::RTC::readData() { if (addr < RTC_STAT_REGA) - *data = clock_data[addr]; + return clock_data[addr]; else { switch (addr) { case RTC_STAT_REGA: // toggle UIP bit for linux stat_regA ^= RTCA_UIP; - *data = stat_regA; + return stat_regA; break; case RTC_STAT_REGB: - *data = stat_regB; + return stat_regB; break; case RTC_STAT_REGC: case RTC_STAT_REGD: - *data = 0x00; + return 0x00; break; + default: + panic("Shouldn't be here"); } } } @@ -263,31 +265,35 @@ TsunamiIO::PITimer::Counter::latchCount() } } -void -TsunamiIO::PITimer::Counter::read(uint8_t *data) +uint8_t +TsunamiIO::PITimer::Counter::read() { if (latch_on) { switch (read_byte) { case LSB: read_byte = MSB; - *data = (uint8_t)latched_count; + return (uint8_t)latched_count; break; case MSB: read_byte = LSB; latch_on = false; - *data = latched_count >> 8; + return latched_count >> 8; break; + default: + panic("Shouldn't be here"); } } else { switch (read_byte) { case LSB: read_byte = MSB; - *data = (uint8_t)count; + return (uint8_t)count; break; case MSB: read_byte = LSB; - *data = count >> 8; + return count >> 8; break; + default: + panic("Shouldn't be here"); } } } @@ -469,16 +475,16 @@ TsunamiIO::read(Packet *pkt) pkt->set(0x00); break; case TSDEV_TMR0_DATA: - pitimer.counter0.read(pkt->getPtr<uint8_t>()); + pkt->set(pitimer.counter0.read()); break; case TSDEV_TMR1_DATA: - pitimer.counter1.read(pkt->getPtr<uint8_t>()); + pkt->set(pitimer.counter1.read()); break; case TSDEV_TMR2_DATA: - pitimer.counter2.read(pkt->getPtr<uint8_t>()); + pkt->set(pitimer.counter2.read()); break; case TSDEV_RTC_DATA: - rtc.readData(pkt->getPtr<uint8_t>()); + pkt->set(rtc.readData()); break; case TSDEV_CTRL_PORTB: if (pitimer.counter2.outputHigh()) |