From 4a391819348a6fac5fe036610d1cc3876ac7df7c Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 27 Sep 2019 22:50:24 -0230 Subject: [PATCH] Eliminate conversion to pointer when it's not necessary. --- src/emucore/AtariVox.cxx | 2 +- src/emucore/SerialPort.hxx | 4 ++-- src/macos/SerialPortMACOS.cxx | 6 +++--- src/macos/SerialPortMACOS.hxx | 2 +- src/unix/SerialPortUNIX.cxx | 6 +++--- src/unix/SerialPortUNIX.hxx | 2 +- src/windows/SerialPortWINDOWS.cxx | 4 ++-- src/windows/SerialPortWINDOWS.hxx | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx index 0ae935b67..9587bd54b 100644 --- a/src/emucore/AtariVox.cxx +++ b/src/emucore/AtariVox.cxx @@ -107,7 +107,7 @@ void AtariVox::clockDataIn(bool value) else { uInt8 data = ((myShiftRegister >> 1) & 0xff); - mySerialPort->writeByte(&data); + mySerialPort->writeByte(data); } myShiftRegister = 0; } diff --git a/src/emucore/SerialPort.hxx b/src/emucore/SerialPort.hxx index e46bfb22d..988fc6abf 100644 --- a/src/emucore/SerialPort.hxx +++ b/src/emucore/SerialPort.hxx @@ -47,7 +47,7 @@ class SerialPort @param data Destination for the byte read from the port @return True if a byte was read, else false */ - virtual bool readByte(uInt8* data) { return false; } + virtual bool readByte(uInt8& data) { return false; } /** Write a byte to the serial port. @@ -55,7 +55,7 @@ class SerialPort @param data The byte to write to the port @return True if a byte was written, else false */ - virtual bool writeByte(const uInt8* data) { return false; } + virtual bool writeByte(uInt8 data) { return false; } private: /** diff --git a/src/macos/SerialPortMACOS.cxx b/src/macos/SerialPortMACOS.cxx index 4d08b9785..0498792bd 100644 --- a/src/macos/SerialPortMACOS.cxx +++ b/src/macos/SerialPortMACOS.cxx @@ -71,12 +71,12 @@ void SerialPortMACOS::closePort() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool SerialPortMACOS::writeByte(const uInt8* data) +bool SerialPortMACOS::writeByte(uInt8 data) { if(myHandle) { -// cerr << "SerialPortMACOS::writeByte " << (int)(*data) << endl; - return write(myHandle, data, 1) == 1; +// cerr << "SerialPortMACOS::writeByte " << int(data) << endl; + return write(myHandle, &data, 1) == 1; } return false; } diff --git a/src/macos/SerialPortMACOS.hxx b/src/macos/SerialPortMACOS.hxx index 7f25104d3..61ef7d284 100644 --- a/src/macos/SerialPortMACOS.hxx +++ b/src/macos/SerialPortMACOS.hxx @@ -51,7 +51,7 @@ class SerialPortMACOS : public SerialPort @param data The byte to write to the port @return True if a byte was written, else false */ - bool writeByte(const uInt8* data) override; + bool writeByte(uInt8 data) override; private: // File descriptor for serial connection diff --git a/src/unix/SerialPortUNIX.cxx b/src/unix/SerialPortUNIX.cxx index e9d9c1ce2..b342fa044 100644 --- a/src/unix/SerialPortUNIX.cxx +++ b/src/unix/SerialPortUNIX.cxx @@ -69,12 +69,12 @@ void SerialPortUNIX::closePort() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool SerialPortUNIX::writeByte(const uInt8* data) +bool SerialPortUNIX::writeByte(uInt8 data) { if(myHandle) { -// cerr << "SerialPortUNIX::writeByte " << (int)(*data) << endl; - return write(myHandle, data, 1) == 1; +// cerr << "SerialPortUNIX::writeByte " << int(data) << endl; + return write(myHandle, &data, 1) == 1; } return false; } diff --git a/src/unix/SerialPortUNIX.hxx b/src/unix/SerialPortUNIX.hxx index c1e800fa8..a7afcd55a 100644 --- a/src/unix/SerialPortUNIX.hxx +++ b/src/unix/SerialPortUNIX.hxx @@ -51,7 +51,7 @@ class SerialPortUNIX : public SerialPort @param data The byte to write to the port @return True if a byte was written, else false */ - bool writeByte(const uInt8* data) override; + bool writeByte(uInt8 data) override; private: // File descriptor for serial connection diff --git a/src/windows/SerialPortWINDOWS.cxx b/src/windows/SerialPortWINDOWS.cxx index 19b7fbe4a..2feb41d0b 100644 --- a/src/windows/SerialPortWINDOWS.cxx +++ b/src/windows/SerialPortWINDOWS.cxx @@ -76,12 +76,12 @@ void SerialPortWINDOWS::closePort() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool SerialPortWINDOWS::writeByte(const uInt8* data) +bool SerialPortWINDOWS::writeByte(uInt8 data) { if(myHandle) { DWORD written; - return WriteFile(myHandle, data, 1, &written, 0) == TRUE; + return WriteFile(myHandle, &data, 1, &written, 0) == TRUE; } return false; } diff --git a/src/windows/SerialPortWINDOWS.hxx b/src/windows/SerialPortWINDOWS.hxx index b6ef2675b..7d6c75cf0 100644 --- a/src/windows/SerialPortWINDOWS.hxx +++ b/src/windows/SerialPortWINDOWS.hxx @@ -50,7 +50,7 @@ class SerialPortWINDOWS : public SerialPort @param data The byte to write to the port @return True if a byte was written, else false */ - bool writeByte(const uInt8* data) override; + bool writeByte(uInt8 data) override; private: // Handle to serial port