From 0b3001976947544025658ee0771ffad7348da7f3 Mon Sep 17 00:00:00 2001 From: logicog Date: Wed, 23 Jul 2025 08:34:26 +0200 Subject: [PATCH] Use names for I2C-controller registers --- rtl837x_regs.h | 8 ++++++++ rtlplayground.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/rtl837x_regs.h b/rtl837x_regs.h index 4bca236..857b7c3 100644 --- a/rtl837x_regs.h +++ b/rtl837x_regs.h @@ -52,6 +52,14 @@ // Configures IO direction for bank a #define RTL837X_REG_GPIO_EXT 0x63e8 + +/* + * I2C controller + */ +#define RTL837X_REG_I2C_CTRL 0x0418 +#define RTL837X_REG_I2C_IN 0x0420 +#define RTL837X_REG_I2C_OUT 0x0424 + /* * NIC Related registers */ diff --git a/rtlplayground.c b/rtlplayground.c index 7144bf0..ed175bb 100644 --- a/rtlplayground.c +++ b/rtlplayground.c @@ -704,26 +704,26 @@ void sds_config(uint8_t sds, uint8_t mode) uint8_t sfp_read_reg(uint8_t slot, uint8_t reg) { if (slot == 0) { - reg_read_m(0x0418); + reg_read_m(RTL837X_REG_I2C_CTRL); sfr_mask_data(1, 0xff, 0x72); - reg_write_m(0x0418); + reg_write_m(RTL837X_REG_I2C_CTRL); } else { - reg_read_m(0x0418); + reg_read_m(RTL837X_REG_I2C_CTRL); sfr_mask_data(1, 0xff, 0x6e); - reg_write_m(0x0418); + reg_write_m(RTL837X_REG_I2C_CTRL); } - REG_WRITE(0x0420, 0, 0, 0, reg); + REG_WRITE(RTL837X_REG_I2C_IN, 0, 0, 0, reg); // Execute I2C Read - reg_bit_set(0x418, 0); + reg_bit_set(RTL837X_REG_I2C_CTRL, 0); // Wait for execution to finish do { - reg_read_m(0x418); + reg_read_m(RTL837X_REG_I2C_CTRL); } while (sfr_data[3] & 0x1); - reg_read_m(0x0424); + reg_read_m(RTL837X_REG_I2C_OUT); return sfr_data[3]; }