i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* rework i2c read / write to make sense using values provided

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42731 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-09-09 19:43:09 +00:00
parent f3ccbf7121
commit f6766f291e
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/gpu.cpp
+41 -9
View File
@@ -282,14 +282,30 @@ get_i2c_signals(void* cookie, int* _clock, int* _data)
{
ddc_info *info = (ddc_info*)cookie;
uint32 value = Read32(OUT, info->gpio_id);
// software only access
//uint32 scl_maskVal = Read32(OUT, info->mask_scl_reg);
//uint32 sda_maskVal = Read32(OUT, info->mask_sda_reg);
//Write32(OUT, info->mask_scl_reg, 1);
//Write32(OUT, info->mask_sda_reg, 1);
*_clock = (value >> info->gpio_y_scl_shift) & 1;
*_data = (value >> info->gpio_y_sda_shift) & 1;
// set read mode
uint32 scl_enVal = Read32(OUT, info->gpio_en_scl_reg);
uint32 sda_enVal = Read32(OUT, info->gpio_en_sda_reg);
Write32(OUT, info->gpio_en_scl_reg, 0);
Write32(OUT, info->gpio_en_sda_reg, 0);
*_clock = Read32(OUT, info->gpio_y_scl_reg);
*_data = Read32(OUT, info->gpio_y_sda_reg);
TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
__func__, info->gpio_id, *_clock, *_data);
// restore previous settings
//Write32(OUT, info->mask_scl_reg, scl_maskVal);
//Write32(OUT, info->mask_sda_reg, sda_maskVal);
Write32(OUT, info->gpio_en_scl_reg, scl_enVal);
Write32(OUT, info->gpio_en_sda_reg, sda_enVal);
return B_OK;
}
@@ -299,18 +315,34 @@ set_i2c_signals(void* cookie, int clock, int data)
{
ddc_info* info = (ddc_info*)cookie;
uint32 value = Read32(OUT, info->gpio_id);
// software only access
uint32 scl_maskVal = Read32(OUT, info->mask_scl_reg);
uint32 sda_maskVal = Read32(OUT, info->mask_sda_reg);
Write32(OUT, info->mask_scl_reg, 1);
Write32(OUT, info->mask_sda_reg, 1);
value &= ~(info->gpio_a_scl_reg | info->gpio_a_sda_reg);
value &= ~(info->gpio_en_sda_reg | info->gpio_en_scl_reg);
value |= ((1 - clock) << info->gpio_en_scl_shift)
| ((1 - data) << info->gpio_en_sda_shift);
// set write mode
uint32 scl_enVal = Read32(OUT, info->gpio_en_scl_reg);
uint32 sda_enVal = Read32(OUT, info->gpio_en_sda_reg);
Write32(OUT, info->gpio_en_scl_reg, 1);
Write32(OUT, info->gpio_en_sda_reg, 1);
Write32(OUT, info->gpio_id, value);
Write32(OUT, info->gpio_a_scl_reg, clock);
Write32(OUT, info->gpio_a_sda_reg, data);
// read back to improve reliability?
Read32(OUT, info->gpio_a_scl_reg);
Read32(OUT, info->gpio_a_sda_reg);
TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
__func__, info->gpio_id, clock, data);
// restore previous settings
Write32(OUT, info->mask_scl_reg, scl_maskVal);
Write32(OUT, info->mask_sda_reg, sda_maskVal);
Write32(OUT, info->gpio_en_scl_reg, scl_enVal);
Write32(OUT, info->gpio_en_sda_reg, sda_enVal);
return B_OK;
}