From 8968ee9d819198c892377b9a35f405b81f51bca0 Mon Sep 17 00:00:00 2001 From: Marcus Glocker Date: Mon, 28 May 2007 13:51:10 +0000 Subject: Add a bunch of new firmware commands to configure MAC/PHY/RF, and do so. Simplify command interface. --- sys/dev/pcmcia/if_maloreg.h | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'sys/dev/pcmcia/if_maloreg.h') diff --git a/sys/dev/pcmcia/if_maloreg.h b/sys/dev/pcmcia/if_maloreg.h index 495f3eddbcb..eac3cdfa99b 100644 --- a/sys/dev/pcmcia/if_maloreg.h +++ b/sys/dev/pcmcia/if_maloreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_maloreg.h,v 1.3 2007/05/26 11:11:54 mglocker Exp $ */ +/* $OpenBSD: if_maloreg.h,v 1.4 2007/05/28 13:51:09 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker @@ -30,7 +30,7 @@ #define MALO_REG_SCRATCH 0x3f #define MALO_REG_CARD_INTR_MASK 0x44 -/* register values */ +/* I/O register values */ #define MALO_VAL_SCRATCH_READY 0x00 #define MALO_VAL_SCRATCH_FW_LOADED 0x5a #define MALO_VAL_HOST_INTR_MASK_ON 0x001f @@ -41,7 +41,22 @@ #define MALO_VAL_HOST_INTR_CMD (1 << 3) /* FW commands */ -#define MALO_VAL_CMD_RESP 0x8000 -#define MALO_VAL_CMD_HWSPEC 0x0003 -#define MALO_VAL_CMD_RESET 0x0005 -#define MALO_VAL_CMD_CHANNEL 0x001d +#define MALO_CMD_RESP 0x8000 +#define MALO_CMD_HWSPEC 0x0003 +#define MALO_CMD_RESET 0x0005 +#define MALO_CMD_STATUS 0x000a +#define MALO_CMD_RADIO 0x001c +#define MALO_CMD_CHANNEL 0x001d +#define MALO_CMD_TXPOWER 0x001e +#define MALO_CMD_ANTENNA 0x0020 +#define MALO_CMD_MACCTRL 0x0028 +#define MALO_CMD_MACADDR 0x004d + +/* FW command values */ +#define MALO_CMD_RADIO_OFF 0x0000 +#define MALO_CMD_RADIO_ON 0x0001 +#define MALO_CMD_RADIO_LONG_P 0x0000 +#define MALO_CMD_RADIO_SHORT_P 0x0002 +#define MALO_CMD_RADIO_AUTO_P 0x0004 +#define MALO_CMD_MACCTRL_RX_ON 0x0001 +#define MALO_CMD_MACCTRL_TX_ON 0x0002 -- cgit v1.2.3