embedtools/src/athctl.c - diff

Return to athctl.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedtools / src

Diff for /embedtools/src/athctl.c between versions 1.1.2.4 and 1.2

version 1.1.2.4, 2010/10/25 14:46:30	version 1.2, 2011/06/08 12:45:41
Line 26 Usage()	Line 26 Usage()
" athctl [-v] -r <0xoffset> <0xMemory_Address>\n"	" athctl [-v] -r <0xoffset> <0xMemory_Address>\n"
" athctl [-v] -w <0xoffset> <0xMemory_Address> <uint16_value>\n"	" athctl [-v] -w <0xoffset> <0xMemory_Address> <uint16_value>\n"
" athctl [-v] -s <file> <0xMemory_Address>\n"	" athctl [-v] -s <file> <0xMemory_Address>\n"
" athctl [-v] -w <file> <0xMemory_Address>\n"	" athctl [-v] -u <file> <0xMemory_Address>\n"
	" athctl [-v] -R <0xMemory_Address> [new_regdomain]\n"
"\n"	"\n"
"\t-v\t\tVerbose ...\n"	"\t-v\t\tVerbose ...\n"
"\t-t\t\tGet current Atheros maximum range in meters\n"	"\t-t\t\tGet current Atheros maximum range in meters\n"
"\t-i <iface_no>\tApply to this Atheros interface number (like ath0 == 0)\n"	"\t-i <iface_no>\tApply to this Atheros interface number (like ath0 == 0)\n"
"\t-d <distance>\tMode distance, meters to target\n"	"\t-d <distance>\tMode distance, meters to target\n"
"\t-c <timeout>\tMode distance, mS timeouts correction\n"	"\t-c <timeout>\tMode distance, mS timeouts correction\n"
	"\t-R\t\tRead or Write EEPROM Regulatory domain\n"
"\t-s <file>\tDump EEPROM to file\n"	"\t-s <file>\tDump EEPROM to file\n"
"\t-u <file>\tUpdate EEPROM from file\n"	"\t-u <file>\tUpdate EEPROM from file\n"
"\t-r <offset>\tRead EEPROM word from PCI mapped memory address\n"	"\t-r <offset>\tRead EEPROM word from PCI mapped memory address\n"
Line 170 devClose(void *basemem)	Line 172 devClose(void *basemem)
munmap(basemem, ATH_PCI_MEM_SIZE);	munmap(basemem, ATH_PCI_MEM_SIZE);
}	}

static inline short	static inline int
readWord(u_char *mem, u_long offset)	readWord(u_char *mem, u_long offset)
{	{
register int timeout = ATH_ACCESS_TIMEOUT;	register int timeout = ATH_ACCESS_TIMEOUT;
u_long stat;	u_long stat;

	VERB(9) printf("Reading EEPROM memory %p+%lx ...\n", mem, offset);
ATH_OUT(mem, AR5211_EEPROM_CONF, 0);	ATH_OUT(mem, AR5211_EEPROM_CONF, 0);
usleep(ATH_ACCESS_WAIT);	usleep(ATH_ACCESS_WAIT);
/* enable eeprom access */	/* enable eeprom access */
Line 198 readWord(u_char *mem, u_long offset)	Line 201 readWord(u_char *mem, u_long offset)
}	}

stat = ATH_IN(mem, AR5211_EEPROM_DATA);	stat = ATH_IN(mem, AR5211_EEPROM_DATA);
return stat & 0x0000ffff;	return (stat & 0x0000ffff) << 16;
}	}
}	}

printf("Error:: EEPROM read timeout!\n");	printf("Error:: EEPROM read timeout!\n");
return 0;	return -1;
}	}

static inline short	static inline int
writeWord(u_char *mem, u_long offset, u_short newval)	writeWord(u_char *mem, u_long offset, u_short newval)
{	{
register int i = ATH_WRITE_RETRY, timeout;	register int i = ATH_WRITE_RETRY, timeout;
u_long pcicfg, stat;	u_long pcicfg, stat;
u_short chk;	int chk;

	VERB(9) printf("Writing EEPROM memory %p+%lx ...\n", mem, offset);
/* enable pci write access */	/* enable pci write access */
pcicfg = ATH_IN(mem, AR5K_PCICFG);	pcicfg = ATH_IN(mem, AR5K_PCICFG);
ATH_OUT(mem, AR5K_PCICFG, (pcicfg & ~AR5K_PCICFG_SPWR_DN));	ATH_OUT(mem, AR5K_PCICFG, (pcicfg & ~AR5K_PCICFG_SPWR_DN));
Line 253 writeWord(u_char *mem, u_long offset, u_short newval)	Line 257 writeWord(u_char *mem, u_long offset, u_short newval)
chk = readWord(mem, offset);	chk = readWord(mem, offset);
if (chk == (u_short) -1)	if (chk == (u_short) -1)
return -1;	return -1;
if (chk == newval)	if ((u_short) (chk >> 16) == newval)
return 1;	return chk;
	else
	VERB(1) printf("Write & Read don`t match 0x%04X != 0x%04X\n", newval, (u_short) (chk >> 16));
if (i)	if (i)
printf("Warning:: Retrying EEPROM write ...\n");	printf("Warning:: Retrying EEPROM write ...\n");
} while (--i);	} while (--i);

printf("Error:: EEPROM write timeout!\n");	printf("Error:: EEPROM write timeout!\n");
return 0;	return -1;
}	}

/*
static int	static int
readEEPROM()	dumpFile(const char csName, u_char mem)
{	{
register u_long i;	register u_long i;
	u_short d1, d2;
	u_char eeprom[ATH_EEPROM_SIZE] = { 0 };
	int f, data;

printf("Reading EEPROM ...\n");	VERB(2) printf("Reading EEPROM memory %p ::\n", mem);
for (i = 0; i < ATH_EEPROM_SIZE / 2; i++) {	for (i = 0; i < ATH_EEPROM_SIZE / 2; i++) {
	if (!(i % 0x40)) {
	if (i)
	printf("]\n");
	printf("0x%04lX [", i * 2);
	}

	if ((data = readWord(mem, i)) == -1)
	return -1;
	else {
	d1 = ((u_short)(data >> 16)) / 0x100;
	d2 = ((u_short)(data >> 16)) % 0x100;

	VERB(5) printf( "Current value 0x%04X on position 0x%04lX will change 0x%02X 0x%02X\n",
	(u_short) (data >> 16), i, d1, d2);
	}

	eeprom[i * 2] = d2;
	eeprom[i * 2 + 1] = d1;

	printf(".");
	usleep(ATH_ACCESS_WAITDOWN);
}	}
	printf("]\n");

	VERB(2) printf("Saving EEPROM to file %s ... ", csName);
	f = open(csName, O_WRONLY \| O_CREAT \| O_TRUNC, 0644);
	if (f == -1) {
	printf("Failed!\nError:: in create file %s #%d - %s\n", csName,
	errno, strerror(errno));
	return 0;
	}
	if (write(f, eeprom, ATH_EEPROM_SIZE) == -1) {
	printf("Failed!\nError:: in write to file %s #%d - %s\n", csName,
	errno, strerror(errno));
	close(f);
	return 0;
	}
	close(f);
	printf("OK!\n");
	return 1;
}	}
*/

	static int
	flashFile(const char csName, u_char mem)
	{
	register u_long i;
	u_short d1;
	u_char eeprom[ATH_EEPROM_SIZE] = { 0 };
	int f, data;

	VERB(2) printf("Reading EEPROM from file %s ... ", csName);
	f = open(csName, O_RDONLY);
	if (f == -1) {
	printf("Failed!\nError:: in open file %s #%d - %s\n", csName,
	errno, strerror(errno));
	return 0;
	}
	if (read(f, eeprom, ATH_EEPROM_SIZE) != ATH_EEPROM_SIZE) {
	printf("Failed!\nError:: failed load image from file %s\n", csName);
	close(f);
	return 0;
	}
	close(f);
	VERB(2) printf("OK!\n");

	VERB(2) printf("Writing EEPROM memory %p ::\n", mem);
	for (i = 0; i < ATH_EEPROM_SIZE / 2; i++) {
	if (!(i % 0x40)) {
	if (i)
	printf("]\n");
	printf("0x%04lX [", i * 2);
	}

	if ((data = readWord(mem, i)) == -1)
	return -1;
	else
	d1 = eeprom[i * 2 + 1] * 0x100 + eeprom[i * 2];
	VERB(5) printf("eeprom_data=0x%04X read_d1=0x%04X\n", (u_char) (data >> 16), d1);

	if (((u_short) (data >> 16)) == d1)
	printf(".");
	else {

	if (writeWord(mem, i, d1) < 1)
	printf("!");
	else
	printf("x");
	}

	usleep(ATH_ACCESS_WAITDOWN);
	}
	printf("]\n");

	return 0;
	}

	static int
	regDomain(u_char *mem, u_short newval)
	{
	int ret, data;

	if ((data = readWord(mem, ATH_OFFSET_REGDOMAIN)) == -1)
	return -1;

	printf("Current value 0x%04X ", (u_short) (data >> 16));
	if (newval != (u_short) -1) {
	printf("will change to 0x%04X\n", newval);

	if ((ret = writeWord(mem, ATH_OFFSET_REGDOMAIN, newval)) == -1)
	return -1;

	printf("Updated regulatory domain is 0x%04X\n", (u_short) (ret >> 16));
	} else
	printf("\nCurrent regulatory domain is 0x%04X\n", (u_short) (data >> 16));

	return 0;
	}

// ----------------------------------------------------	// ----------------------------------------------------

int	int
Line 286 main(int argc, char **argv)	Line 408 main(int argc, char **argv)
u_short newval = 0;	u_short newval = 0;
void *basemem = NULL;	void *basemem = NULL;

while ((ch = getopt(argc, argv, "hvtr:w:i:d:c:u:s:")) != -1)	while ((ch = getopt(argc, argv, "hvRtr:w:i:d:c:u:s:")) != -1)
switch (ch) {	switch (ch) {
case 'v':	case 'v':
Verbose++;	Verbose++;
Line 321 main(int argc, char **argv)	Line 443 main(int argc, char **argv)
mode = 0x20;	mode = 0x20;
strlcpy(szName, optarg, MAXPATHLEN);	strlcpy(szName, optarg, MAXPATHLEN);
break;	break;
	case 'R':
	mode = 0x40;
	break;
case 'r':	case 'r':
mode = 4;	mode = 4;
offset = strtoul(optarg, NULL, 0);	offset = strtoul(optarg, NULL, 0);
Line 353 main(int argc, char **argv)	Line 478 main(int argc, char **argv)
} else	} else
newval = (u_short) strtoul(argv[1], NULL, 0);	newval = (u_short) strtoul(argv[1], NULL, 0);
}	}
	if (mode & 0x40) {
	if (argv[1])
	newval = (u_short) strtoul(argv[1], NULL, 0);
	else
	newval = (u_short) -1;
	}

if (mode & 1)	if (mode & 1)
if ((ret = calcDistance(ino, dist, cor)) < 1)	if ((ret = calcDistance(ino, dist, cor)) < 1)
Line 371 main(int argc, char **argv)	Line 502 main(int argc, char **argv)
if (mode & 4) {	if (mode & 4) {
if (!(basemem = devOpen(baseaddr)))	if (!(basemem = devOpen(baseaddr)))
return 2;	return 2;
if ((ret = readWord(basemem, offset)) < 1) {	if ((ret = readWord(basemem, offset)) == -1) {
devClose(basemem);	devClose(basemem);
return 3;	return 3;
}	} else
	printf("EEPROM readed value 0x%04X\n", (u_short) (ret >> 16));
devClose(basemem);	devClose(basemem);
}	}
if (mode & 8) {	if (mode & 8) {
if (!(basemem = devOpen(baseaddr)))	if (!(basemem = devOpen(baseaddr)))
return 2;	return 2;
if ((ret = writeWord(basemem, offset, newval)) < 1) {	if ((ret = writeWord(basemem, offset, newval)) == -1) {
	devClose(basemem);
	return 3;
	} else
	printf("EEPROM writed value 0x%04X\n", (u_short) (ret >> 16));
	devClose(basemem);
	}

	if (mode & 0x10) {
	if (!(basemem = devOpen(baseaddr)))
	return 2;
	if ((ret = dumpFile(szName, basemem)) < 1) {
	devClose(basemem);
	return 3;
	}
	devClose(basemem);
	}
	if (mode & 0x20) {
	if (!(basemem = devOpen(baseaddr)))
	return 2;
	if ((ret = flashFile(szName, basemem)) < 1) {
	devClose(basemem);
	return 3;
	}
	devClose(basemem);
	}

	if (mode & 0x40) {
	if (!(basemem = devOpen(baseaddr)))
	return 2;
	if ((ret = regDomain(basemem, newval)) < 1) {
devClose(basemem);	devClose(basemem);
return 3;	return 3;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.4
changed lines
	Added in v.1.2