Add more BCCMD command ids and PS key values

2 files changed, 51 insertions, 31 deletions

diff --git a/tools/csr.c b/tools/csr.c
index 5a08d51f..4ab38232 100644
--- a/tools/csr.c
+++ b/tools/csr.c
@@ -408,6 +408,12 @@ char *csr_chipvertostr(uint16_t ver, uint16_t rev)
 char *csr_pskeytostr(uint16_t pskey)
 {
 	switch (pskey) {
+	case CSR_PSKEY_BDADDR:
+		return "Bluetooth address";
+	case CSR_PSKEY_COUNTRYCODE:
+		return "Country code";
+	case CSR_PSKEY_CLASSOFDEVICE:
+		return "Class of device";
 	case CSR_PSKEY_ENC_KEY_LMIN:
 		return "Minimum encryption key length";
 	case CSR_PSKEY_ENC_KEY_LMAX:
diff --git a/tools/csr.h b/tools/csr.h
index e6c2acad..ff2c6541 100644
--- a/tools/csr.h
+++ b/tools/csr.h
@@ -26,38 +26,52 @@
  *  $Id$
  */
 
-#define CSR_VARID_BC01_STATUS		0x2801		/* uint16 */
-#define CSR_VARID_BUILDID		0x2819		/* uint16 */
-#define CSR_VARID_CHIPVER		0x281a		/* uint16 */
-#define CSR_VARID_CHIPREV		0x281b		/* uint16 */
-#define CSR_VARID_INTERFACE_VERSION	0x2825		/* uint16 */
-#define CSR_VARID_RAND			0x282a		/* uint16 */
-#define CSR_VARID_MAX_CRYPT_KEY_LENGTH	0x282c		/* uint16 */
-#define CSR_VARID_CHIPANAREV		0x2836		/* uint16 */
-#define CSR_VARID_BUILDID_LOADER	0x2838		/* uint16 */
-#define CSR_VARID_BT_CLOCK		0x2c00		/* uint32 */
-#define CSR_VARID_CRYPT_KEY_LENGTH	0x3008		/* complex */
-#define CSR_VARID_PICONET_INSTANCE	0x3009		/* complex */
-#define CSR_VARID_GET_CLR_EVT		0x300a		/* complex */
-#define CSR_VARID_GET_NEXT_BUILDDEF	0x300b		/* complex */
-#define CSR_VARID_COLD_RESET		0x4001		/* valueless */
-#define CSR_VARID_WARM_RESET		0x4002		/* valueless */
-#define CSR_VARID_COLD_HALT		0x4003		/* valueless */
-#define CSR_VARID_WARM_HALT		0x4004		/* valueless */
-#define CSR_VARID_INIT_BT_STACK		0x4005		/* valueless */
-#define CSR_VARID_ACTIVATE_BT_STACK	0x4006		/* valueless */
-#define CSR_VARID_ENABLE_TX		0x4007		/* valueless */
-#define CSR_VARID_DISABLE_TX		0x4008		/* valueless */
-#define CSR_VARID_RECAL			0x4009		/* valueless */
-#define CSR_VARID_CANCEL_PAGE		0x4012		/* valueless */
-#define CSR_VARID_MAP_SCO_PCM		0x481c		/* uint16 */
-#define CSR_VARID_NO_VARIABLE		0x6000		/* valueless */
-#define CSR_VARID_CONFIG_UART		0x6802		/* uint16 */
-#define CSR_VARID_PANIC_ARG		0x6805		/* uint16 */
-#define CSR_VARID_FAULT_ARG		0x6806		/* uint16 */
-#define CSR_VARID_MAX_TX_POWER		0x6827		/* int8 */
-#define CSR_VARID_DEFAULT_TX_POWER	0x682b		/* int8 */
+#define CSR_VARID_PS_CLR_ALL			0x000b	/* valueless */
+#define CSR_VARID_PS_FACTORY_SET		0x000c	/* valueless */
+#define CSR_VARID_PS_CLR_ALL_STORES		0x082d	/* uint16 */
+#define CSR_VARID_BC01_STATUS			0x2801	/* uint16 */
+#define CSR_VARID_BUILDID			0x2819	/* uint16 */
+#define CSR_VARID_CHIPVER			0x281a	/* uint16 */
+#define CSR_VARID_CHIPREV			0x281b	/* uint16 */
+#define CSR_VARID_INTERFACE_VERSION		0x2825	/* uint16 */
+#define CSR_VARID_RAND				0x282a	/* uint16 */
+#define CSR_VARID_MAX_CRYPT_KEY_LENGTH		0x282c	/* uint16 */
+#define CSR_VARID_CHIPANAREV			0x2836	/* uint16 */
+#define CSR_VARID_BUILDID_LOADER		0x2838	/* uint16 */
+#define CSR_VARID_BT_CLOCK			0x2c00	/* uint32 */
+#define CSR_VARID_PS_NEXT			0x3005	/* complex */
+#define CSR_VARID_PS_SIZE			0x3006	/* complex */
+#define CSR_VARID_CRYPT_KEY_LENGTH		0x3008	/* complex */
+#define CSR_VARID_PICONET_INSTANCE		0x3009	/* complex */
+#define CSR_VARID_GET_CLR_EVT			0x300a	/* complex */
+#define CSR_VARID_GET_NEXT_BUILDDEF		0x300b	/* complex */
+#define CSR_VARID_COLD_RESET			0x4001	/* valueless */
+#define CSR_VARID_WARM_RESET			0x4002	/* valueless */
+#define CSR_VARID_COLD_HALT			0x4003	/* valueless */
+#define CSR_VARID_WARM_HALT			0x4004	/* valueless */
+#define CSR_VARID_INIT_BT_STACK			0x4005	/* valueless */
+#define CSR_VARID_ACTIVATE_BT_STACK		0x4006	/* valueless */
+#define CSR_VARID_ENABLE_TX			0x4007	/* valueless */
+#define CSR_VARID_DISABLE_TX			0x4008	/* valueless */
+#define CSR_VARID_RECAL				0x4009	/* valueless */
+#define CSR_VARID_PS_FACTORY_RESTORE		0x400d	/* valueless */
+#define CSR_VARID_PS_FACTORY_RESTORE_ALL	0x400e	/* valueless */
+#define CSR_VARID_PS_DEFRAG_RESET		0x400f	/* valueless */
+#define CSR_VARID_CANCEL_PAGE			0x4012	/* valueless */
+#define CSR_VARID_PS_CLR			0x4818	/* uint16 */
+#define CSR_VARID_MAP_SCO_PCM			0x481c	/* uint16 */
+#define CSR_VARID_PS_CLR_STORES			0x500c	/* complex */
+#define CSR_VARID_NO_VARIABLE			0x6000	/* valueless */
+#define CSR_VARID_CONFIG_UART			0x6802	/* uint16 */
+#define CSR_VARID_PANIC_ARG			0x6805	/* uint16 */
+#define CSR_VARID_FAULT_ARG			0x6806	/* uint16 */
+#define CSR_VARID_MAX_TX_POWER			0x6827	/* int8 */
+#define CSR_VARID_DEFAULT_TX_POWER		0x682b	/* int8 */
+#define CSR_VARID_PS				0x7002	/* complex */
 
+#define CSR_PSKEY_BDADDR			0x0001	/* uint16[] = { 0x00A5A5, 0x5b, 0x0002 } */
+#define CSR_PSKEY_COUNTRYCODE			0x0002	/* uint16 */
+#define CSR_PSKEY_CLASSOFDEVICE			0x0003	/* uint32 */
 #define CSR_PSKEY_ENC_KEY_LMIN			0x00da	/* uint16 */
 #define CSR_PSKEY_ENC_KEY_LMAX			0x00db	/* uint16 */
 #define CSR_PSKEY_LOCAL_SUPPORTED_FEATURES	0x00ef	/* uint16[] = { 0xffff, 0xfe8f, 0xf99b, 0x8000 } */