Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPIO info struct style cleanup, (hopefully) no functional change

Browse Source
This commit is contained in:
Alexander von Gluck IV 2011-12-14 11:09:41 -06:00
parent 249495e284
commit 18500e1cd6
5 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/add-ons/accelerants/radeon_hd/accelerant.h
View File

@ -102,28 +102,28 @@ struct register_info {
typedef struct {
bool valid;
bool hw_capable; // can do hw assisted i2c
uint32 hw_line;
uint32 hwPin; // GPIO hardware pin on GPU
bool hwCapable; // can do hw assisted i2c
uint32 mask_scl_reg;
uint32 mask_sda_reg;
uint32 mask_scl_mask;
uint32 mask_sda_mask;
uint32 sclMaskReg;
uint32 sdaMaskReg;
uint32 sclMask;
uint32 sdaMask;
uint32 en_scl_reg;
uint32 en_sda_reg;
uint32 en_scl_mask;
uint32 en_sda_mask;
uint32 sclEnReg;
uint32 sdaEnReg;
uint32 sclEnMask;
uint32 sdaEnMask;
uint32 y_scl_reg;
uint32 y_sda_reg;
uint32 y_scl_mask;
uint32 y_sda_mask;
uint32 sclYReg;
uint32 sdaYReg;
uint32 sclYMask;
uint32 sdaYMask;
uint32 a_scl_reg;
uint32 a_sda_reg;
uint32 a_scl_mask;
uint32 a_sda_mask;
uint32 sclAReg;
uint32 sdaAReg;
uint32 sclAMask;
uint32 sdaAMask;
} gpio_info;

112
src/add-ons/accelerants/radeon_hd/connector.cpp
View File

@ -39,46 +39,46 @@ gpio_lock_i2c(void* cookie, bool lock)
uint32 buffer = 0;
if (lock == true) {
// hw_capable and > DCE3
if (info->hw_capable == true && gInfo->shared_info->dceMajor >= 3) {
// hwCapable and > DCE3
if (info->hwCapable == true && gInfo->shared_info->dceMajor >= 3) {
// Switch GPIO pads to ddc mode
buffer = Read32(OUT, info->mask_scl_reg);
buffer = Read32(OUT, info->sclMaskReg);
buffer &= ~(1 << 16);
Write32(OUT, info->mask_scl_reg, buffer);
Write32(OUT, info->sclMaskReg, buffer);
}
// Clear pins
buffer = Read32(OUT, info->a_scl_reg) & ~info->a_scl_mask;
Write32(OUT, info->a_scl_reg, buffer);
buffer = Read32(OUT, info->a_sda_reg) & ~info->a_sda_mask;
Write32(OUT, info->a_sda_reg, buffer);
buffer = Read32(OUT, info->sclAReg) & ~info->sclAMask;
Write32(OUT, info->sclAReg, buffer);
buffer = Read32(OUT, info->sdaAReg) & ~info->sdaAMask;
Write32(OUT, info->sdaAReg, buffer);
}
// Set pins to input
buffer = Read32(OUT, info->en_scl_reg) & ~info->en_scl_mask;
Write32(OUT, info->en_scl_reg, buffer);
buffer = Read32(OUT, info->en_sda_reg) & ~info->en_sda_mask;
Write32(OUT, info->en_sda_reg, buffer);
buffer = Read32(OUT, info->sclEnReg) & ~info->sclEnMask;
Write32(OUT, info->sclEnReg, buffer);
buffer = Read32(OUT, info->sdaEnReg) & ~info->sdaEnMask;
Write32(OUT, info->sdaEnReg, buffer);
// mask clock GPIO pins for software use
buffer = Read32(OUT, info->mask_scl_reg);
buffer = Read32(OUT, info->sclMaskReg);
if (lock == true)
buffer |= info->mask_scl_mask;
buffer |= info->sclMask;
else
buffer &= ~info->mask_scl_mask;
buffer &= ~info->sclMask;
Write32(OUT, info->mask_scl_reg, buffer);
Read32(OUT, info->mask_scl_reg);
Write32(OUT, info->sclMaskReg, buffer);
Read32(OUT, info->sclMaskReg);
// mask data GPIO pins for software use
buffer = Read32(OUT, info->mask_sda_reg);
buffer = Read32(OUT, info->sdaMaskReg);
if (lock == true)
buffer |= info->mask_sda_mask;
buffer |= info->sdaMask;
else
buffer &= ~info->mask_sda_mask;
buffer &= ~info->sdaMask;
Write32(OUT, info->mask_sda_reg, buffer);
Read32(OUT, info->mask_sda_reg);
Write32(OUT, info->sdaMaskReg, buffer);
Read32(OUT, info->sdaMaskReg);
}
@ -87,8 +87,8 @@ gpio_get_i2c_bit(void* cookie, int* _clock, int* _data)
{
gpio_info* info = (gpio_info*)cookie;
uint32 scl = Read32(OUT, info->y_scl_reg) & info->y_scl_mask;
uint32 sda = Read32(OUT, info->y_sda_reg) & info->y_sda_mask;
uint32 scl = Read32(OUT, info->sclYReg) & info->sclYMask;
uint32 sda = Read32(OUT, info->sdaYReg) & info->sdaYMask;
*_clock = scl != 0;
*_data = sda != 0;
@ -102,15 +102,15 @@ gpio_set_i2c_bit(void* cookie, int clock, int data)
{
gpio_info* info = (gpio_info*)cookie;
uint32 scl = Read32(OUT, info->en_scl_reg) & ~info->en_scl_mask;
scl |= clock ? 0 : info->en_scl_mask;
Write32(OUT, info->en_scl_reg, scl);
Read32(OUT, info->en_scl_reg);
uint32 scl = Read32(OUT, info->sclEnReg) & ~info->sclEnMask;
scl |= clock ? 0 : info->sclEnMask;
Write32(OUT, info->sclEnReg, scl);
Read32(OUT, info->sclEnReg);
uint32 sda = Read32(OUT, info->en_sda_reg) & ~info->en_sda_mask;
sda |= data ? 0 : info->en_sda_mask;
Write32(OUT, info->en_sda_reg, sda);
Read32(OUT, info->en_sda_reg);
uint32 sda = Read32(OUT, info->sdaEnReg) & ~info->sdaEnMask;
sda |= data ? 0 : info->sdaEnMask;
Write32(OUT, info->sdaEnReg, sda);
Read32(OUT, info->sdaEnReg);
return B_OK;
}
@ -223,11 +223,11 @@ connector_read_edid_lvds(uint32 connectorIndex, edid1_info* edid)
status_t
connector_attach_gpio(uint32 connectorIndex, uint8 hwLine)
connector_attach_gpio(uint32 connectorIndex, uint8 hwPin)
{
gConnector[connectorIndex]->gpioID = 0;
for (uint32 i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) {
if (gGPIOInfo[i]->hw_line != hwLine)
if (gGPIOInfo[i]->hwPin != hwPin)
continue;
gConnector[connectorIndex]->gpioID = i;
return B_OK;
@ -295,50 +295,50 @@ gpio_probe()
}
// populate gpio information
gGPIOInfo[i]->hw_line = gpio->sucI2cId.ucAccess;
gGPIOInfo[i]->hw_capable
gGPIOInfo[i]->hwPin = gpio->sucI2cId.ucAccess;
gGPIOInfo[i]->hwCapable
= (gpio->sucI2cId.sbfAccess.bfHW_Capable) ? true : false;
// GPIO mask (Allows software to control the GPIO pad)
// 0 = chip access; 1 = only software;
gGPIOInfo[i]->mask_scl_reg
gGPIOInfo[i]->sclMaskReg
= B_LENDIAN_TO_HOST_INT16(gpio->usClkMaskRegisterIndex) * 4;
gGPIOInfo[i]->mask_sda_reg
gGPIOInfo[i]->sdaMaskReg
= B_LENDIAN_TO_HOST_INT16(gpio->usDataMaskRegisterIndex) * 4;
gGPIOInfo[i]->mask_scl_mask = 1 << gpio->ucClkMaskShift;
gGPIOInfo[i]->mask_sda_mask = 1 << gpio->ucDataMaskShift;
gGPIOInfo[i]->sclMask = 1 << gpio->ucClkMaskShift;
gGPIOInfo[i]->sdaMask = 1 << gpio->ucDataMaskShift;
// GPIO output / write (A) enable
// 0 = GPIO input (Y); 1 = GPIO output (A);
gGPIOInfo[i]->en_scl_reg
gGPIOInfo[i]->sclEnReg
= B_LENDIAN_TO_HOST_INT16(gpio->usClkEnRegisterIndex) * 4;
gGPIOInfo[i]->en_sda_reg
gGPIOInfo[i]->sdaEnReg
= B_LENDIAN_TO_HOST_INT16(gpio->usDataEnRegisterIndex) * 4;
gGPIOInfo[i]->en_scl_mask = 1 << gpio->ucClkEnShift;
gGPIOInfo[i]->en_sda_mask = 1 << gpio->ucDataEnShift;
gGPIOInfo[i]->sclEnMask = 1 << gpio->ucClkEnShift;
gGPIOInfo[i]->sdaEnMask = 1 << gpio->ucDataEnShift;
// GPIO output / write (A)
gGPIOInfo[i]->a_scl_reg
gGPIOInfo[i]->sclAReg
= B_LENDIAN_TO_HOST_INT16(gpio->usClkA_RegisterIndex) * 4;
gGPIOInfo[i]->a_sda_reg
gGPIOInfo[i]->sdaAReg
= B_LENDIAN_TO_HOST_INT16(gpio->usDataA_RegisterIndex) * 4;
gGPIOInfo[i]->a_scl_mask = 1 << gpio->ucClkA_Shift;
gGPIOInfo[i]->a_sda_mask = 1 << gpio->ucDataA_Shift;
gGPIOInfo[i]->sclAMask = 1 << gpio->ucClkA_Shift;
gGPIOInfo[i]->sdaAMask = 1 << gpio->ucDataA_Shift;
// GPIO input / read (Y)
gGPIOInfo[i]->y_scl_reg
gGPIOInfo[i]->sclYReg
= B_LENDIAN_TO_HOST_INT16(gpio->usClkY_RegisterIndex) * 4;
gGPIOInfo[i]->y_sda_reg
gGPIOInfo[i]->sdaYReg
= B_LENDIAN_TO_HOST_INT16(gpio->usDataY_RegisterIndex) * 4;
gGPIOInfo[i]->y_scl_mask = 1 << gpio->ucClkY_Shift;
gGPIOInfo[i]->y_sda_mask = 1 << gpio->ucDataY_Shift;
gGPIOInfo[i]->sclYMask = 1 << gpio->ucClkY_Shift;
gGPIOInfo[i]->sdaYMask = 1 << gpio->ucDataY_Shift;
// ensure data is valid
gGPIOInfo[i]->valid = gGPIOInfo[i]->mask_scl_reg ? true : false;
gGPIOInfo[i]->valid = gGPIOInfo[i]->sclMaskReg ? true : false;
TRACE("%s: GPIO @ %" B_PRIu32 ", valid: %s, hw_line: 0x%" B_PRIX32 "\n",
TRACE("%s: GPIO @ %" B_PRIu32 ", valid: %s, hwPin: 0x%" B_PRIX32 "\n",
__func__, i, gGPIOInfo[i]->valid ? "true" : "false",
gGPIOInfo[i]->hw_line);
gGPIOInfo[i]->hwPin);
}
return B_OK;
@ -727,7 +727,7 @@ debug_connectors()
ERROR(" + connector: %s\n", get_connector_name(connectorType));
ERROR(" + gpio table id: %" B_PRIu16 "\n", gpioID);
ERROR(" + gpio hw pin: 0x%" B_PRIX32 "\n",
gGPIOInfo[gpioID]->hw_line);
gGPIOInfo[gpioID]->hwPin);
ERROR(" + gpio valid: %s\n",
gGPIOInfo[gpioID]->valid ? "true" : "false");
ERROR(" + encoder: %s\n", get_encoder_name(encoderType));

2
src/add-ons/accelerants/radeon_hd/connector.h
View File

@ -61,7 +61,7 @@ const int kConnectorConvert[] = {
status_t gpio_probe();
status_t connector_attach_gpio(uint32 id, uint8 hw_line);
status_t connector_attach_gpio(uint32 id, uint8 hwPin);
bool connector_read_edid(uint32 connector, edid1_info* edid);
status_t connector_probe();
status_t connector_probe_legacy();

22
src/add-ons/accelerants/radeon_hd/displayport.cpp
View File

@ -29,10 +29,10 @@
static int
dp_aux_speak(uint32 hwLine, uint8* send, int sendBytes,
dp_aux_speak(uint32 hwPin, uint8* send, int sendBytes,
uint8* recv, int recvBytes, uint8 delay, uint8* ack)
{
if (hwLine == 0) {
if (hwPin == 0) {
ERROR("%s: cannot speak on invalid GPIO pin!\n", __func__);
return B_IO_ERROR;
}
@ -50,7 +50,7 @@ dp_aux_speak(uint32 hwLine, uint8* send, int sendBytes,
args.v1.lpAuxRequest = 0;
args.v1.lpDataOut = 16;
args.v1.ucDataOutLen = 0;
args.v1.ucChannelID = hwLine;
args.v1.ucChannelID = hwPin;
args.v1.ucDelay = delay / 10;
//if (ASIC_IS_DCE4(rdev))
@ -87,7 +87,7 @@ dp_aux_speak(uint32 hwLine, uint8* send, int sendBytes,
int
dp_aux_write(uint32 hwLine, uint16 address,
dp_aux_write(uint32 hwPin, uint16 address,
uint8* send, uint8 sendBytes, uint8 delay)
{
uint8 auxMessage[20];
@ -105,7 +105,7 @@ dp_aux_write(uint32 hwLine, uint16 address,
uint8 retry;
for (retry = 0; retry < 4; retry++) {
uint8 ack;
int result = dp_aux_speak(hwLine, auxMessage, auxMessageBytes,
int result = dp_aux_speak(hwPin, auxMessage, auxMessageBytes,
NULL, 0, delay, &ack);
if (result == B_BUSY)
@ -126,7 +126,7 @@ dp_aux_write(uint32 hwLine, uint16 address,
int
dp_aux_read(uint32 hwLine, uint16 address,
dp_aux_read(uint32 hwPin, uint16 address,
uint8* recv, int recvBytes, uint8 delay)
{
uint8 auxMessage[4];
@ -140,7 +140,7 @@ dp_aux_read(uint32 hwLine, uint16 address,
uint8 retry;
for (retry = 0; retry < 4; retry++) {
uint8 ack;
int result = dp_aux_speak(hwLine, auxMessage, auxMessageBytes,
int result = dp_aux_speak(hwPin, auxMessage, auxMessageBytes,
recv, recvBytes, delay, &ack);
if (result == B_BUSY)
@ -161,7 +161,7 @@ dp_aux_read(uint32 hwLine, uint16 address,
status_t
dp_aux_get_i2c_byte(uint32 hwLine, uint16 address, uint8* data, bool end)
dp_aux_get_i2c_byte(uint32 hwPin, uint16 address, uint8* data, bool end)
{
uint8 auxMessage[5];
int auxMessageBytes = 4; // 4 for read
@ -182,7 +182,7 @@ dp_aux_get_i2c_byte(uint32 hwLine, uint16 address, uint8* data, bool end)
uint8 reply[2];
int replyBytes = 1;
int result = dp_aux_speak(hwLine, auxMessage, auxMessageBytes,
int result = dp_aux_speak(hwPin, auxMessage, auxMessageBytes,
reply, replyBytes, 0, &ack);
if (result == B_BUSY)
continue;
@ -232,7 +232,7 @@ dp_aux_get_i2c_byte(uint32 hwLine, uint16 address, uint8* data, bool end)
status_t
dp_aux_set_i2c_byte(uint32 hwLine, uint16 address, uint8* data, bool end)
dp_aux_set_i2c_byte(uint32 hwPin, uint16 address, uint8* data, bool end)
{
uint8 auxMessage[5];
int auxMessageBytes = 5; // 5 for write
@ -254,7 +254,7 @@ dp_aux_set_i2c_byte(uint32 hwLine, uint16 address, uint8* data, bool end)
uint8 reply[2];
int replyBytes = 1;
int result = dp_aux_speak(hwLine, auxMessage, auxMessageBytes,
int result = dp_aux_speak(hwPin, auxMessage, auxMessageBytes,
reply, replyBytes, 0, &ack);
if (result == B_BUSY)
continue;

8
src/add-ons/accelerants/radeon_hd/displayport.h
View File

@ -13,13 +13,13 @@
#include <SupportDefs.h>
int dp_aux_write(uint32 hwLine, uint16 address, uint8* send,
int dp_aux_write(uint32 hwPin, uint16 address, uint8* send,
uint8 sendBytes, uint8 delay);
int dp_aux_read(uint32 hwLine, uint16 address, uint8* recv,
int dp_aux_read(uint32 hwPin, uint16 address, uint8* recv,
int recvBytes, uint8 delay);
status_t dp_aux_set_i2c_byte(uint32 hwLine, uint16 address,
status_t dp_aux_set_i2c_byte(uint32 hwPin, uint16 address,
uint8* data, bool end);
status_t dp_aux_get_i2c_byte(uint32 hwLine, uint16 address,
status_t dp_aux_get_i2c_byte(uint32 hwPin, uint16 address,
uint8* data, bool end);
uint32 dp_get_link_clock(uint32 connectorIndex);