From dbf2eb7ed15233c912e8c080dbe30ae54021fc94 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 23 Feb 2018 12:07:02 -0800 Subject: [PATCH] Clean up BPMPFW I2C prototypes. Prototypes for internal functions shouldn't be in shared headers. --- exosphere/bpmpfw/src/i2c.c | 10 ++++++++++ exosphere/bpmpfw/src/i2c.h | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/exosphere/bpmpfw/src/i2c.c b/exosphere/bpmpfw/src/i2c.c index f0d65bc07..46e811266 100644 --- a/exosphere/bpmpfw/src/i2c.c +++ b/exosphere/bpmpfw/src/i2c.c @@ -1,6 +1,12 @@ #include "i2c.h" #include "timer.h" +/* Prototypes for internal commands. */ +void i2c_load_config(void); +int i2c_write(unsigned int device, uint32_t val, unsigned int num_bytes); +int i2c_send_byte_command(unsigned int device, unsigned char reg, unsigned char b); + +/* Load hardware config for I2C4. */ void i2c_load_config(void) { /* Set MSTR_CONFIG_LOAD, TIMEOUT_CONFIG_LOAD, undocumented bit. */ I2C_I2C_CONFIG_LOAD_0 = 0x25; @@ -14,6 +20,7 @@ void i2c_load_config(void) { } } +/* Initialize I2C4. */ void i2c_init(void) { /* Setup divisor, and clear the bus. */ I2C_I2C_CLK_DIVISOR_REGISTER_0 = 0x50001; @@ -38,6 +45,7 @@ void i2c_init(void) { I2C_INTERRUPT_STATUS_REGISTER_0 = int_status; } +/* Writes a value to an i2c device. */ int i2c_write(unsigned int device, uint32_t val, unsigned int num_bytes) { if (num_bytes > 4) { return 0; @@ -66,12 +74,14 @@ int i2c_write(unsigned int device, uint32_t val, unsigned int num_bytes) { return (I2C_I2C_STATUS_0 & 7) == 0; } +/* Writes a byte val to reg for given device. */ int i2c_send_byte_command(unsigned int device, unsigned char reg, unsigned char b) { uint32_t val = (reg) | (b << 8); /* Write 1 byte (reg) + 1 byte (value) */ return i2c_write(device, val, 2); } +/* Actually reset device 27. This might turn off the screen? */ int i2c_send_reset_cmd(void) { /* Write 00 to Device 27 Reg 00. */ return i2c_send_byte_command(27, 0, 0); diff --git a/exosphere/bpmpfw/src/i2c.h b/exosphere/bpmpfw/src/i2c.h index 2fa2ff45f..be656ee1e 100644 --- a/exosphere/bpmpfw/src/i2c.h +++ b/exosphere/bpmpfw/src/i2c.h @@ -27,19 +27,8 @@ #define I2C_I2C_CONFIG_LOAD_0 MAKE_I2C_REG(0x08C) -/* Initialize I2C4. */ void i2c_init(void); -/* Load hardware config for I2C4. */ -void i2c_load_config(void); - -/* Actually reset device 27. This might turn off the screen? */ int i2c_send_reset_cmd(void); -/* Writes a value to an i2c device. */ -int i2c_write(unsigned int device, uint32_t val, unsigned int num_bytes); - -/* Writes a byte val to reg for given device. */ -int i2c_send_byte_command(unsigned int device, unsigned char reg, unsigned char b); - #endif \ No newline at end of file