From fff1e2f2427f31a994f85981b3a8b32a23f746c5 Mon Sep 17 00:00:00 2001 From: dmlb Date: Thu, 17 May 2001 22:23:49 +0000 Subject: Primary purpose of this commit is to enable support for the Aviator Pro and Raylink cards with version 5 firmware. Only infra-structure mode has been tested. Specific changes for this feature are: o Add RFC1042 encapsulation of IP datagrams o Add authentication and association o Decode of the beacon (although not used) Other changes have been made: o Pass command completion status to *_done (in place for adding proper error recovery) o Move a couple of state variables into the current network parameters structure. This is in prep. for dealing with roaming. MFC after: 1 week --- sys/dev/ray/if_raydbg.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'sys/dev/ray/if_raydbg.h') diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h index 7dc255d..965a180 100644 --- a/sys/dev/ray/if_raydbg.h +++ b/sys/dev/ray/if_raydbg.h @@ -39,7 +39,7 @@ /* * RAY_DEBUG settings * - * RECERR Recoverable error's, deprecated use RAY_RECERR macro + * AUTH Authentication * SUBR Subroutine entry * BOOTPARAM Startup CM dump * STARTJOIN State transitions for start/join @@ -55,7 +55,7 @@ * TX TX routine info * DCOM dump comq entries */ -#define RAY_DBG_RECERR 0x0001 +#define RAY_DBG_AUTH 0x0001 #define RAY_DBG_SUBR 0x0002 #define RAY_DBG_BOOTPARAM 0x0004 #define RAY_DBG_STARTJOIN 0x0008 @@ -131,12 +131,17 @@ * These override macros defined in if_ray.c to turn them into * debugging ones. */ -#if RAY_DEBUG & RAY_DBG_COM +#if RAY_DEBUG +#define RAY_RECERR(sc, fmt, args...) do { \ + device_printf((sc)->dev, "%s(%d) " fmt "\n", \ + __FUNCTION__ , __LINE__ , ##args); \ +} while (0) +#endif /* RAY_DEBUG */ +#if RAY_DEBUG & RAY_DBG_COM #define RAY_COM_CHECK(sc, com) do { if (RAY_DEBUG & RAY_DBG_COM) { \ ray_com_ecf_check((sc), (com), __FUNCTION__ ); \ } } while (0) - #endif /* RAY_DEBUG & RAY_DBG_COM */ #if RAY_DEBUG & RAY_DBG_MBUF -- cgit v1.1