--- embedtools/src/athctl.c	2010/11/05 00:43:27	1.1.2.11
+++ embedtools/src/athctl.c	2012/07/22 22:46:47	1.3
@@ -3,9 +3,46 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: athctl.c,v 1.1.2.11 2010/11/05 00:43:27 misho Exp $
+ * $Id: athctl.c,v 1.3 2012/07/22 22:46:47 misho Exp $
  *
- *************************************************************************/
+ *************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include "athctl.h"
 
@@ -375,6 +412,28 @@ flashFile(const char *csName, u_char *mem)
 	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
@@ -456,8 +515,12 @@ main(int argc, char **argv)
 		} else
 			newval = (u_short) strtoul(argv[1], NULL, 0);
 	}
-	if (mode & 0x40 && argv[1])
-		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 ((ret = calcDistance(ino, dist, cor)) < 1)
@@ -516,12 +579,10 @@ main(int argc, char **argv)
 	if (mode & 0x40) {
 		if (!(basemem = devOpen(baseaddr)))
 			return 2;
-		/*
 		if ((ret = regDomain(basemem, newval)) < 1) {
 			devClose(basemem);
 			return 3;
 		}
-		*/
 		devClose(basemem);
 	}