d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update athpoke/athregs to use the modified register read diagnostic API.

Browse Source
This commit is contained in:
Adrian Chadd 2014-08-09 18:17:16 +00:00
parent fad86101e5
commit fa5e9502cd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/tools/ath/athpoke/athpoke.c
View File

@ -123,7 +123,7 @@ static uint32_t
regread(int s, struct ath_diag *atd, uint32_t r)
{
HAL_REGRANGE ra;
uint32_t v[2];
uint32_t v[3];
ra.start = r;
ra.end = 0;
@ -135,7 +135,7 @@ regread(int s, struct ath_diag *atd, uint32_t r)
atd->ad_id = HAL_DIAG_REGS | ATH_DIAG_IN | ATH_DIAG_DYN;
if (ioctl(s, SIOCGATHDIAG, atd) < 0)
err(1, atd->ad_name);
return v[1];
return v[2];
}
static void

7
tools/tools/ath/athregs/dumpregs.c
View File

@ -182,8 +182,9 @@ main(int argc, char *argv[])
dp = (u_int32_t *)atd.ad_out_data;
ep = (u_int32_t *)(atd.ad_out_data + atd.ad_out_size);
while (dp < ep) {
u_int r = dp[0] >> 16; /* start of range */
u_int e = dp[0] & 0xffff; /* end of range */
u_int r = dp[0]; /* start of range */
u_int e = dp[1]; /* end of range */
dp++;
dp++;
/* convert offsets to indices */
r >>= 2; e >>= 2;
@ -611,7 +612,7 @@ ath_hal_setupdiagregs(const HAL_REGRANGE regs[], u_int nr)
space = 0;
for (i = 0; i < nr; i++) {
u_int n = 2 * sizeof(u_int32_t); /* reg range + first */
u_int n = sizeof(HAL_REGRANGE) + sizeof(u_int32_t); /* reg range + first */
if (regs[i].end) {
if (regs[i].end < regs[i].start) {
fprintf(stderr, "%s: bad register range, "