Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / p80211meta.h

diff --git a/drivers/staging/wlan-ng/p80211meta.h b/drivers/staging/wlan-ng/p80211meta.h
index 8b61e5fc292bf74b4cfb43954681de5ef9db0ed7..2f3c9fc3358c4ec6945cf0f317111b6a503a0e86 100644 (file)
--- a/drivers/staging/wlan-ng/p80211meta.h
+++ b/drivers/staging/wlan-ng/p80211meta.h
@@ -57,51 +57,9 @@
 #ifndef _P80211META_H
 #define _P80211META_H
 
-/*================================================================*/
-/* System Includes */
-
 /*================================================================*/
 /* Project Includes */
 
-#ifndef _WLAN_COMPAT_H
-#include "wlan_compat.h"
-#endif
-
-/*================================================================*/
-/* Constants */
-
-/*----------------------------------------------------------------*/
-/* */
-
-/*================================================================*/
-/* Macros */
-
-/*----------------------------------------------------------------*/
-/* The following macros are used to ensure consistent naming */
-/*  conventions for all the different metadata lists. */
-
-#define MKREQMETANAME(name)            p80211meta_ ## req ## _ ## name
-#define MKINDMETANAME(name)            p80211meta_ ## ind ## _ ## name
-#define MKMIBMETANAME(name)            p80211meta_ ## mib ## _ ## name
-#define MKGRPMETANAME(name)            p80211meta_ ## grp ## _ ## name
-
-#define MKREQMETASIZE(name)            p80211meta_ ## req ## _ ## name ## _ ## size
-#define MKINDMETASIZE(name)            p80211meta_ ## ind ## _ ## name ## _ ## size
-#define MKMIBMETASIZE(name)            p80211meta_ ## mib ## _ ## name ## _ ## size
-#define MKGRPMETASIZE(name)            p80211meta_ ## grp ## _ ## name ## _ ## size
-
-#define GETMETASIZE(aptr)              (**((u32**)(aptr)))
-
-/*----------------------------------------------------------------*/
-/* The following ifdef depends on the following defines: */
-/*  P80211_NOINCLUDESTRINGS - if defined, all metadata name fields */
-/*                               are empty strings */
-
-#ifdef P80211_NOINCLUDESTRINGS
-       #define MKITEMNAME(s)   ("")
-#else
-       #define MKITEMNAME(s)   (s)
-#endif
 
 /*================================================================*/
 /* Types */
@@ -111,59 +69,29 @@
 /* representation of category list metadata, group list metadata, */
 /* and data item metadata for both Mib and Messages. */
 
-typedef struct p80211meta
-{
-       char                    *name;          /* data item name */
-       u32                     did;            /* partial did */
-       u32                     flags;          /* set of various flag bits */
-       u32                     min;            /* min value of a BOUNDEDint */
-       u32                     max;            /* max value of a BOUNDEDint */
-
-       u32                     maxlen;         /* maxlen of a OCTETSTR or DISPLAYSTR */
-       u32                     minlen;         /* minlen of a OCTETSTR or DISPLAYSTR */
-       p80211enum_t            *enumptr;       /* ptr to the enum type for ENUMint */
-       p80211_totext_t         totextptr;      /* ptr to totext conversion function */
-       p80211_fromtext_t       fromtextptr;    /* ptr to totext conversion function */
-       p80211_valid_t          validfunptr;    /* ptr to totext conversion function */
+typedef struct p80211meta {
+       char *name;             /* data item name */
+       u32 did;                /* partial did */
+       u32 flags;              /* set of various flag bits */
+       u32 min;                /* min value of a BOUNDEDint */
+       u32 max;                /* max value of a BOUNDEDint */
+
+       u32 maxlen;             /* maxlen of a OCTETSTR or DISPLAYSTR */
+       u32 minlen;             /* minlen of a OCTETSTR or DISPLAYSTR */
+       p80211enum_t *enumptr;  /* ptr to the enum type for ENUMint */
+       p80211_totext_t totextptr;      /* ptr to totext conversion function */
+       p80211_fromtext_t fromtextptr;  /* ptr to totext conversion function */
+       p80211_valid_t validfunptr;     /* ptr to totext conversion function */
 } p80211meta_t;
 
-typedef struct grplistitem
-{
-       char            *name;
-       p80211meta_t    *itemlist;
+typedef struct grplistitem {
+       char *name;
+       p80211meta_t *itemlist;
 } grplistitem_t;
 
-typedef struct catlistitem
-{
-       char            *name;
-       grplistitem_t   *grplist;
+typedef struct catlistitem {
+       char *name;
+       grplistitem_t *grplist;
 } catlistitem_t;
 
-/*================================================================*/
-/* Extern Declarations */
-
-/*----------------------------------------------------------------*/
-/* */
-
-/*================================================================*/
-/* Function Declarations */
-
-/*----------------------------------------------------------------*/
-/* */
-u32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
-u32 p80211_text2catdid(catlistitem_t *list, char *name );
-u32 p80211_text2grpdid(grplistitem_t *list, char *name );
-u32 p80211_text2itemdid(p80211meta_t *list, char *name );
-u32 p80211_isvalid_did( catlistitem_t *catlist, u32 did );
-u32 p80211_isvalid_catdid( catlistitem_t *catlist, u32 did );
-u32 p80211_isvalid_grpdid( catlistitem_t *catlist, u32 did );
-u32 p80211_isvalid_itemdid( catlistitem_t *catlist, u32 did );
-catlistitem_t *p80211_did2cat( catlistitem_t *catlist, u32 did );
-grplistitem_t *p80211_did2grp( catlistitem_t *catlist, u32 did );
-p80211meta_t *p80211_did2item( catlistitem_t *catlist, u32 did );
-u32 p80211item_maxdatalen( struct catlistitem *metalist, u32 did );
-u32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
-u32 p80211item_getoffset( struct catlistitem *metalist, u32 did );
-int p80211item_gettype(p80211meta_t *meta);
-
 #endif /* _P80211META_H */