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

* fix several i2c communication bugs

Browse Source 
dealing with i2c register addresses.
* cleanup i2c hacks
* now receive the following message in SimNow:
  "No device present at I2C slave address 0x66"


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-09-26 16:50:29 +00:00
parent 2ccad1f632
commit 2ce1337c71
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/gpu.cpp
+15 -22
View File
@@ -281,10 +281,13 @@ static void
lock_i2c(void* cookie, bool lock) lock_i2c(void* cookie, bool lock)
{ {
gpio_info *info = (gpio_info*)cookie; gpio_info *info = (gpio_info*)cookie;
radeon_shared_info &sinfo = *gInfo->shared_info;
uint32 buffer = 0; uint32 buffer = 0;
if (info->hw_capable == true) { // hw_capable and > DCE3
if (info->hw_capable == true
&& sinfo.device_chipset >= (RADEON_R600 | 0x20)) {
// Switch GPIO pads to ddc mode // Switch GPIO pads to ddc mode
buffer = Read32(OUT, info->mask_scl_reg); buffer = Read32(OUT, info->mask_scl_reg);
buffer &= ~(1 << 16); buffer &= ~(1 << 16);
@@ -304,14 +307,11 @@ lock_i2c(void* cookie, bool lock)
Write32(OUT, info->en_sda_reg, buffer); Write32(OUT, info->en_sda_reg, buffer);
// mask GPIO pins for software use // mask GPIO pins for software use
// TODO : we should use the mask... but it doesn't work for some reason buffer = Read32(OUT, info->mask_scl_reg);
// buffer = Read32(OUT, info->mask_scl_reg);
if (lock == true) { if (lock == true) {
buffer = 1; buffer |= info->mask_scl_mask;
//buffer |= info->mask_scl_mask;
} else { } else {
buffer = 0; buffer &= ~info->mask_scl_mask;
//buffer &= ~info->mask_scl_mask;
} }
Write32(OUT, info->mask_scl_reg, buffer); Write32(OUT, info->mask_scl_reg, buffer);
@@ -319,16 +319,13 @@ lock_i2c(void* cookie, bool lock)
buffer = Read32(OUT, info->mask_sda_reg); buffer = Read32(OUT, info->mask_sda_reg);
if (lock == true) { if (lock == true) {
buffer = 1; buffer |= info->mask_sda_mask;
// buffer |= info->mask_sda_mask;
} else { } else {
buffer = 0; buffer &= ~info->mask_sda_mask;
// buffer &= ~info->mask_sda_mask;
} }
Write32(OUT, info->mask_sda_reg, buffer); Write32(OUT, info->mask_sda_reg, buffer);
Read32(OUT, info->mask_sda_reg); Read32(OUT, info->mask_sda_reg);
} }
@@ -337,15 +334,14 @@ get_i2c_signals(void* cookie, int* _clock, int* _data)
{ {
gpio_info *info = (gpio_info*)cookie; gpio_info *info = (gpio_info*)cookie;
uint32 scl = Read32(OUT, info->y_scl_reg) & info->y_scl_mask; uint32 scl = Read32(OUT, info->y_scl_reg);
uint32 sda = Read32(OUT, info->y_sda_reg) & info->y_sda_mask; scl &= info->y_scl_mask;
uint32 sda = Read32(OUT, info->y_sda_reg);
sda &= info->y_sda_mask;
*_clock = (scl != 0); *_clock = (scl != 0);
*_data = (sda != 0); *_data = (sda != 0);
//TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
// __func__, info->i2c_slave_addr, *_clock, *_data);
return B_OK; return B_OK;
} }
@@ -363,11 +359,8 @@ set_i2c_signals(void* cookie, int clock, int data)
scl |= clock ? 0 : info->en_scl_mask; scl |= clock ? 0 : info->en_scl_mask;
sda |= data ? 0 : info->en_sda_mask; sda |= data ? 0 : info->en_sda_mask;
Write32(OUT, info->a_scl_reg, clock); Write32(OUT, info->en_scl_reg, scl);
Write32(OUT, info->a_sda_reg, data); Write32(OUT, info->en_sda_reg, sda);
//TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
// __func__, info->i2c_slave_addr, clock, data);
return B_OK; return B_OK;
} }