From 3c34a659a09ec413bfe79ffd238ebd1db8c84926 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 22 Aug 2019 19:03:59 -0500 Subject: [PATCH] Rename nct6793d to nct6775 to align with nct6775 naming convention from hwmon-based Linux driver --- OpenAuraSDK.cpp | 6 +-- ...ton_nct6793d.cpp => i2c_smbus_nct6775.cpp} | 34 ++++++++--------- ...nuvoton_nct6793d.h => i2c_smbus_nct6775.h} | 38 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) rename i2c_smbus/{i2c_smbus_nuvoton_nct6793d.cpp => i2c_smbus_nct6775.cpp} (73%) rename i2c_smbus/{i2c_smbus_nuvoton_nct6793d.h => i2c_smbus_nct6775.h} (54%) diff --git a/OpenAuraSDK.cpp b/OpenAuraSDK.cpp index 12195aea..e93301c3 100644 --- a/OpenAuraSDK.cpp +++ b/OpenAuraSDK.cpp @@ -20,7 +20,7 @@ #include #include "i2c_smbus_piix4.h" #include "i2c_smbus_i801.h" -#include "i2c_smbus_nuvoton_nct6793d.h" +#include "i2c_smbus_nuvoton_nct6775.h" #include "wmi.h" #include "inpout32.h" @@ -124,14 +124,14 @@ void DetectNuvotonI2CBusses() case SIO_NCT6102_ID: case SIO_NCT6793_ID: case SIO_NCT6796_ID: - bus = new i2c_smbus_nuvoton_nct6793d(); + bus = new i2c_smbus_nuvoton_nct6775(); // Set logical device register to get SMBus base address superio_outb(sioaddr, SIO_REG_LOGDEV, SIO_LOGDEV_SMBUS); // Get SMBus base address from configuration register int smba = (superio_inb(sioaddr, SIO_REG_SMBA) << 8) | superio_inb(sioaddr, SIO_REG_SMBA + 1); - ((i2c_smbus_nuvoton_nct6793d*)bus)->nuvoton_nct6793d_smba = smba; + ((i2c_smbus_nuvoton_nct6775*)bus)->nuvoton_nct6775_smba = smba; // Set device name string switch (val & SIO_ID_MASK) diff --git a/i2c_smbus/i2c_smbus_nuvoton_nct6793d.cpp b/i2c_smbus/i2c_smbus_nct6775.cpp similarity index 73% rename from i2c_smbus/i2c_smbus_nuvoton_nct6793d.cpp rename to i2c_smbus/i2c_smbus_nct6775.cpp index 50fc5c24..26d75b3c 100644 --- a/i2c_smbus/i2c_smbus_nuvoton_nct6793d.cpp +++ b/i2c_smbus/i2c_smbus_nct6775.cpp @@ -1,22 +1,22 @@ /*-----------------------------------------*\ -| i2c_smbus_nuvoton_nct6793d.cpp | +| i2c_smbus_nct6775.cpp | | | -| Nuvoton NCT6793D SMBUS driver for Windows| +| Nuvoton NCT67xx SMBUS driver for Windows | | | | Adam Honse (CalcProgrammer1) 5/19/2019 | \*-----------------------------------------*/ -#include "i2c_smbus_nuvoton_nct6793d.h" +#include "i2c_smbus_nct6775.h" #include #include "inpout32.h" #pragma comment(lib, "inpout32.lib") -s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data) +s32 i2c_smbus_nuvoton_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data) { int i, len, status, cnt; - Out32(SMBHSTCTL, NCT6793D_SOFT_RESET); + Out32(SMBHSTCTL, NCT6775_SOFT_RESET); switch (size) { @@ -30,11 +30,11 @@ s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 co if (read_write == I2C_SMBUS_WRITE) { Out32(SMBHSTDAT, data->byte); - Out32(SMBHSTCMD, NCT6793D_WRITE_BYTE); + Out32(SMBHSTCMD, NCT6775_WRITE_BYTE); } else { - Out32(SMBHSTCMD, NCT6793D_READ_BYTE); + Out32(SMBHSTCMD, NCT6775_READ_BYTE); } break; case I2C_SMBUS_WORD_DATA: @@ -44,11 +44,11 @@ s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 co { Out32(SMBHSTDAT, data->word & 0xFF); Out32(SMBHSTDAT, (data->word & 0xFF00) >> 8); - Out32(SMBHSTCMD, NCT6793D_WRITE_WORD); + Out32(SMBHSTCMD, NCT6775_WRITE_WORD); } else { - Out32(SMBHSTCMD, NCT6793D_READ_WORD); + Out32(SMBHSTCMD, NCT6775_READ_WORD); } break; case I2C_SMBUS_BLOCK_DATA: @@ -85,25 +85,25 @@ s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 co len = 0; } - Out32(SMBHSTCMD, NCT6793D_WRITE_BLOCK); + Out32(SMBHSTCMD, NCT6775_WRITE_BLOCK); } else { return -EOPNOTSUPP; - //Out32(SMBHSTCMD, NCT6793D_READ_BLOCK); + //Out32(SMBHSTCMD, NCT6775_READ_BLOCK); } break; default: return -EOPNOTSUPP; } - Out32(SMBHSTCTL, NCT6793D_MANUAL_START); + Out32(SMBHSTCTL, NCT6775_MANUAL_START); while ((size == I2C_SMBUS_BLOCK_DATA) && (len > 0)) { if (read_write == I2C_SMBUS_WRITE) { - while ((Inp32(SMBHSTSTS) & NCT6793D_FIFO_EMPTY) == 0); + while ((Inp32(SMBHSTSTS) & NCT6775_FIFO_EMPTY) == 0); //Load more bytes into FIFO if (len >= 4) @@ -129,9 +129,9 @@ s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 co } //wait for manual mode to complete - while ((Inp32(SMBHSTSTS) & NCT6793D_MANUAL_ACTIVE) != 0); + while ((Inp32(SMBHSTSTS) & NCT6775_MANUAL_ACTIVE) != 0); - if ((Inp32(SMBHSTERR) & NCT6793D_NO_ACK) != 0) + if ((Inp32(SMBHSTERR) & NCT6775_NO_ACK) != 0) { return -EPROTO; } @@ -154,7 +154,7 @@ s32 i2c_smbus_nuvoton_nct6793d::nct6793d_access(u16 addr, char read_write, u8 co return 0; } -s32 i2c_smbus_nuvoton_nct6793d::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data) +s32 i2c_smbus_nuvoton_nct6775::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data) { - return nct6793d_access(addr, read_write, command, size, data); + return nct6775_access(addr, read_write, command, size, data); } \ No newline at end of file diff --git a/i2c_smbus/i2c_smbus_nuvoton_nct6793d.h b/i2c_smbus/i2c_smbus_nct6775.h similarity index 54% rename from i2c_smbus/i2c_smbus_nuvoton_nct6793d.h rename to i2c_smbus/i2c_smbus_nct6775.h index 3796b72e..5ee0ce28 100644 --- a/i2c_smbus/i2c_smbus_nuvoton_nct6793d.h +++ b/i2c_smbus/i2c_smbus_nct6775.h @@ -1,7 +1,7 @@ /*-----------------------------------------*\ -| i2c_smbus_nuvoton_nct6793d.h | +| i2c_smbus_nct6775.h | | | -| Nuvoton NCT6793D SMBUS driver for Windows| +| Nuvoton NCT67xx SMBUS driver for Windows | | | | Adam Honse (CalcProgrammer1) 5/19/2019 | \*-----------------------------------------*/ @@ -20,34 +20,34 @@ #define SMBHSTSTS (0xE + nuvoton_nct6793d_smba) /* Command register */ -#define NCT6793D_READ_BYTE 0 -#define NCT6793D_READ_WORD 1 -#define NCT6793D_READ_BLOCK 2 -#define NCT6793D_BLOCK_WRITE_READ_PROC_CALL 3 -#define NCT6793D_PROC_CALL 4 -#define NCT6793D_WRITE_BYTE 8 -#define NCT6793D_WRITE_WORD 9 -#define NCT6793D_WRITE_BLOCK 10 +#define NCT6775_READ_BYTE 0 +#define NCT6775_READ_WORD 1 +#define NCT6775_READ_BLOCK 2 +#define NCT6775_BLOCK_WRITE_READ_PROC_CALL 3 +#define NCT6775_PROC_CALL 4 +#define NCT6775_WRITE_BYTE 8 +#define NCT6775_WRITE_WORD 9 +#define NCT6775_WRITE_BLOCK 10 /* Control register */ -#define NCT6793D_MANUAL_START 128 -#define NCT6793D_SOFT_RESET 64 +#define NCT6775_MANUAL_START 128 +#define NCT6775_SOFT_RESET 64 /* Error register */ -#define NCT6793D_NO_ACK 32 +#define NCT677f_NO_ACK 32 /* Status register */ -#define NCT6793D_FIFO_EMPTY 1 -#define NCT6793D_FIFO_FULL 2 -#define NCT6793D_MANUAL_ACTIVE 4 +#define NCT6775_FIFO_EMPTY 1 +#define NCT6775_FIFO_FULL 2 +#define NCT6775_MANUAL_ACTIVE 4 -class i2c_smbus_nuvoton_nct6793d : public i2c_smbus_interface +class i2c_smbus_nct6775: public i2c_smbus_interface { public: - u16 nuvoton_nct6793d_smba = 0x0290; + u16 nct6775_smba = 0x0290; private: - s32 nct6793d_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data); + s32 nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data); s32 i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data); }; \ No newline at end of file