Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: csr: delete a bunch of unused library functions

Browse Source 
These functions were never being called, so they can be safely deleted.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-07-20 17:25:09 -07:00
parent 9e16d45768
commit 419e926688
6 changed files with 0 additions and 615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/csr/csr_msgconv.c
View File

@ -290,35 +290,3 @@ CsrMsgConvEntry *CsrMsgConvInit(void)
return converter;
}
EXPORT_SYMBOL_GPL(CsrMsgConvInit);
CsrMsgConvEntry *CsrMsgConvGet(void)
{
return converter;
}
#ifdef ENABLE_SHUTDOWN
void CsrMsgConvDeinit(void)
{
CsrMsgConvPrimEntry *s;
if (converter == NULL)
{
return;
}
/* Walk converter list and free elements. */
s = converter->profile_converters;
while (s)
{
CsrMsgConvPrimEntry *s_next;
s_next = s->next;
kfree(s);
s = s_next;
}
kfree(converter);
converter = NULL;
}
EXPORT_SYMBOL_GPL(CsrMsgConvDeinit);
#endif /* ENABLE_SHUTDOWN */

57
drivers/staging/csr/csr_msgconv.h
View File

@ -64,17 +64,7 @@ void CsrMsgConvInsert(u16 primType, const CsrMsgConvMsgEntry *ce);
CsrMsgConvPrimEntry *CsrMsgConvFind(u16 primType);
CsrMsgConvMsgEntry *CsrMsgConvFindEntry(u16 primType, u16 msgType);
CsrMsgConvMsgEntry *CsrMsgConvFindEntryByMsg(u16 primType, const void *msg);
CsrMsgConvEntry *CsrMsgConvGet(void);
CsrMsgConvEntry *CsrMsgConvInit(void);
#ifdef ENABLE_SHUTDOWN
void CsrMsgConvDeinit(void);
#endif /* ENABLE_SHUTDOWN */
/* SHOULD BE INTERNAL TO FRAMEWORK AKA DEPRECATED */
u32 CsrCharStringSerLen(const char *str);
u32 CsrUtf8StringSerLen(const u8 *str);
u32 CsrUtf16StringSerLen(const u16 *str);
/* Prototypes for primitive type serializers */
void CsrUint8Ser(u8 *buffer, size_t *offset, u8 value);
@ -82,60 +72,13 @@ void CsrUint16Ser(u8 *buffer, size_t *offset, u16 value);
void CsrUint32Ser(u8 *buffer, size_t *offset, u32 value);
void CsrMemCpySer(u8 *buffer, size_t *offset, const void *value, size_t length);
void CsrCharStringSer(u8 *buffer, size_t *offset, const char *value);
void CsrUtf8StringSer(u8 *buffer, size_t *offset, const u8 *value);
void CsrUtf16StringSer(u8 *buffer, size_t *offset, const u16 *value);
void CsrVoidPtrSer(u8 *buffer, size_t *offset, void *ptr);
void CsrSizeSer(u8 *buffer, size_t *offset, size_t value);
void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset);
void CsrUint16Des(u16 *value, u8 *buffer, size_t *offset);
void CsrUint32Des(u32 *value, u8 *buffer, size_t *offset);
void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length);
void CsrCharStringDes(char **value, u8 *buffer, size_t *offset);
void CsrUtf8StringDes(u8 **value, u8 *buffer, size_t *offset);
void CsrUtf16StringDes(u16 **value, u8 *buffer, size_t *offset);
void CsrVoidPtrDes(void **value, u8 *buffer, size_t *offset);
void CsrSizeDes(size_t *value, u8 *buffer, size_t *offset);
size_t CsrEventSizeof(void *msg);
u8 *CsrEventSer(u8 *ptr, size_t *len, void *msg);
void *CsrEventDes(u8 *buffer, size_t length);
size_t CsrEventCsrUint8Sizeof(void *msg);
u8 *CsrEventCsrUint8Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint8Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint16Sizeof(void *msg);
u8 *CsrEventCsrUint16Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint16Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint32Sizeof(void *msg);
u8 *CsrEventCsrUint32Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint32Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint16CsrUint8Sizeof(void *msg);
u8 *CsrEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint16CsrUint8Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint16CsrUint16Sizeof(void *msg);
u8 *CsrEventCsrUint16CsrUint16Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint16CsrUint16Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint16CsrUint32Sizeof(void *msg);
u8 *CsrEventCsrUint16CsrUint32Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint16CsrCharStringSizeof(void *msg);
u8 *CsrEventCsrUint16CsrCharStringSer(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint16CsrCharStringDes(u8 *buffer, size_t length);
size_t CsrEventCsrUint32CsrUint16Sizeof(void *msg);
u8 *CsrEventCsrUint32CsrUint16Ser(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length);
size_t CsrEventCsrUint32CsrCharStringSizeof(void *msg);
u8 *CsrEventCsrUint32CsrCharStringSer(u8 *ptr, size_t *len, void *msg);
void *CsrEventCsrUint32CsrCharStringDes(u8 *buffer, size_t length);
#ifdef __cplusplus
}

398
drivers/staging/csr/csr_serialize_primitive_types.c
View File

@ -15,34 +15,6 @@
#include "csr_macro.h"
#include "csr_lib.h"
/********************************************************************************
*
* Name: CsrUtf16StrLen
*
* Description: The function returns the number of 16 bit elements present
* in the 0-terminated string.
*
* Input: 0-terminated string of 16 bit unicoded characters.
*
* Output: The number of 16 bit elements in the string.
*
*********************************************************************************/
static u32 CsrUtf16StrLen(const u16 *unicodeString)
{
u32 length;
length = 0;
if (unicodeString != NULL)
{
while (*unicodeString)
{
length++;
unicodeString++;
}
}
return length;
}
void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)
{
*value = buffer[*offset];
@ -82,39 +54,6 @@ void CsrCharStringDes(char **value, u8 *buffer, size_t *offset)
}
EXPORT_SYMBOL_GPL(CsrCharStringDes);
void CsrUtf8StringDes(u8 **value, u8 *buffer, size_t *offset)
{
*value = (u8 *)kstrdup((char *) &buffer[*offset], GFP_KERNEL);
*offset += strlen((char *) *value) + 1;
}
void CsrUtf16StringDes(u16 **value, u8 *buffer, size_t *offset)
{
u32 length, i;
CsrUint32Des(&length, buffer, offset);
*value = kmalloc(length * sizeof(**value), GFP_KERNEL);
for (i = 0; i < length; i++)
{
CsrUint16Des(&(*value)[i], buffer, offset);
}
}
void CsrSizeDes(size_t *value, u8 *buffer, size_t *offset)
{
*value = (buffer[*offset + 0] << 0) |
(buffer[*offset + 1] << 8) |
(buffer[*offset + 2] << 16) |
(buffer[*offset + 3] << 24);
*offset += sizeof(*value);
}
void CsrVoidPtrDes(void **value, u8 *buffer, size_t *offset)
{
CsrSizeDes((size_t *) value, buffer, offset);
}
void CsrUint8Ser(u8 *buffer, size_t *offset, u8 value)
{
buffer[*offset] = value;
@ -160,340 +99,3 @@ void CsrCharStringSer(u8 *buffer, size_t *offset, const char *value)
}
}
EXPORT_SYMBOL_GPL(CsrCharStringSer);
void CsrUtf8StringSer(u8 *buffer, size_t *offset, const u8 *value)
{
CsrCharStringSer(buffer, offset, (char *) value);
}
void CsrUtf16StringSer(u8 *buffer, size_t *offset, const u16 *value)
{
if (value)
{
u32 length = CsrUtf16StrLen(value) + 1;
u32 i;
CsrUint32Ser(buffer, offset, length);
for (i = 0; i < length; i++)
{
CsrUint16Ser(buffer, offset, (u16) value[i]);
}
}
else
{
CsrUint32Ser(buffer, offset, 0);
}
}
void CsrSizeSer(u8 *buffer, size_t *offset, size_t value)
{
buffer[*offset + 0] = (u8) ((value >> 0) & 0xFF);
buffer[*offset + 1] = (u8) ((value >> 8) & 0xFF);
buffer[*offset + 2] = (u8) ((value >> 16) & 0xFF);
buffer[*offset + 3] = (u8) ((value >> 24) & 0xFF);
*offset += sizeof(value);
}
void CsrVoidPtrSer(u8 *buffer, size_t *offset, void *ptr)
{
CsrSizeSer(buffer, offset, (size_t) ptr);
}
u32 CsrCharStringSerLen(const char *str)
{
if (str)
{
return (u32)(strlen(str) + sizeof(*str));
}
else
{
return sizeof(*str);
}
}
u32 CsrUtf8StringSerLen(const u8 *str)
{
if (str)
{
return (u32)(strlen((char *) str) + sizeof(*str));
}
else
{
return sizeof(*str);
}
}
u32 CsrUtf16StringSerLen(const u16 *str)
{
if (str)
{
/* We always write down the length of the string */
return sizeof(u32) + (CsrUtf16StrLen(str) + 1) * sizeof(*str);
}
else
{
return sizeof(u32);
}
}
size_t CsrEventSizeof(void *msg)
{
return 2;
}
u8 *CsrEventSer(u8 *ptr, size_t *len, void *msg)
{
CsrEvent *primitive = (CsrEvent *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
return ptr;
}
void *CsrEventDes(u8 *buffer, size_t length)
{
CsrEvent *primitive = kmalloc(sizeof(CsrEvent), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint8Sizeof(void *msg)
{
return 3;
}
u8 *CsrEventCsrUint8Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint8 *primitive = (CsrEventCsrUint8 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint8Ser(ptr, len, primitive->value);
return ptr;
}
void *CsrEventCsrUint8Des(u8 *buffer, size_t length)
{
CsrEventCsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint8), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint8Des(&primitive->value, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint16Sizeof(void *msg)
{
return 4;
}
u8 *CsrEventCsrUint16Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint16 *primitive = (CsrEventCsrUint16 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint16Ser(ptr, len, primitive->value);
return ptr;
}
void *CsrEventCsrUint16Des(u8 *buffer, size_t length)
{
CsrEventCsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint16Des(&primitive->value, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint32Sizeof(void *msg)
{
return 6;
}
u8 *CsrEventCsrUint32Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint32 *primitive = (CsrEventCsrUint32 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint32Ser(ptr, len, primitive->value);
return ptr;
}
void *CsrEventCsrUint32Des(u8 *buffer, size_t length)
{
CsrEventCsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint32), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint32Des(&primitive->value, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint16CsrUint8Sizeof(void *msg)
{
return 5;
}
u8 *CsrEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint16CsrUint8 *primitive = (CsrEventCsrUint16CsrUint8 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint16Ser(ptr, len, primitive->value1);
CsrUint8Ser(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint16CsrUint8Des(u8 *buffer, size_t length)
{
CsrEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint8), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint16Des(&primitive->value1, buffer, &offset);
CsrUint8Des(&primitive->value2, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint16CsrUint16Sizeof(void *msg)
{
return 6;
}
u8 *CsrEventCsrUint16CsrUint16Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint16CsrUint16 *primitive = (CsrEventCsrUint16CsrUint16 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint16Ser(ptr, len, primitive->value1);
CsrUint16Ser(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint16CsrUint16Des(u8 *buffer, size_t length)
{
CsrEventCsrUint16CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint16), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint16Des(&primitive->value1, buffer, &offset);
CsrUint16Des(&primitive->value2, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint16CsrUint32Sizeof(void *msg)
{
return 8;
}
u8 *CsrEventCsrUint16CsrUint32Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint16CsrUint32 *primitive = (CsrEventCsrUint16CsrUint32 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint16Ser(ptr, len, primitive->value1);
CsrUint32Ser(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length)
{
CsrEventCsrUint16CsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint32), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint16Des(&primitive->value1, buffer, &offset);
CsrUint32Des(&primitive->value2, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint16CsrCharStringSizeof(void *msg)
{
CsrEventCsrUint16CsrCharString *primitive = (CsrEventCsrUint16CsrCharString *) msg;
return 4 + strlen(primitive->value2) + 1;
}
u8 *CsrEventCsrUint16CsrCharStringSer(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint16CsrCharString *primitive = (CsrEventCsrUint16CsrCharString *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint16Ser(ptr, len, primitive->value1);
CsrCharStringSer(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint16CsrCharStringDes(u8 *buffer, size_t length)
{
CsrEventCsrUint16CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrCharString), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint16Des(&primitive->value1, buffer, &offset);
CsrCharStringDes(&primitive->value2, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint32CsrUint16Sizeof(void *msg)
{
return 8;
}
u8 *CsrEventCsrUint32CsrUint16Ser(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint32CsrUint16 *primitive = (CsrEventCsrUint32CsrUint16 *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint32Ser(ptr, len, primitive->value1);
CsrUint16Ser(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length)
{
CsrEventCsrUint32CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrUint16), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint32Des(&primitive->value1, buffer, &offset);
CsrUint16Des(&primitive->value2, buffer, &offset);
return primitive;
}
size_t CsrEventCsrUint32CsrCharStringSizeof(void *msg)
{
CsrEventCsrUint32CsrCharString *primitive = (CsrEventCsrUint32CsrCharString *) msg;
return 6 + strlen(primitive->value2) + 1;
}
u8 *CsrEventCsrUint32CsrCharStringSer(u8 *ptr, size_t *len, void *msg)
{
CsrEventCsrUint32CsrCharString *primitive = (CsrEventCsrUint32CsrCharString *) msg;
*len = 0;
CsrUint16Ser(ptr, len, primitive->type);
CsrUint32Ser(ptr, len, primitive->value1);
CsrCharStringSer(ptr, len, primitive->value2);
return ptr;
}
void *CsrEventCsrUint32CsrCharStringDes(u8 *buffer, size_t length)
{
CsrEventCsrUint32CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrCharString), GFP_KERNEL);
size_t offset = 0;
CsrUint16Des(&primitive->type, buffer, &offset);
CsrUint32Des(&primitive->value1, buffer, &offset);
CsrCharStringDes(&primitive->value2, buffer, &offset);
return primitive;
}

27
drivers/staging/csr/csr_time.c
View File

@ -41,30 +41,3 @@ CsrTime CsrTimeGet(CsrTime *high)
return low;
}
EXPORT_SYMBOL_GPL(CsrTimeGet);
void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high)
{
struct timespec ts;
u64 time;
ts = current_kernel_time();
time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
if (high != NULL)
{
*high = (CsrTime) ((time >> 32) & 0xFFFFFFFF);
}
if (low != NULL)
{
*low = (CsrTime) (time & 0xFFFFFFFF);
}
if (tod != NULL)
{
struct timeval tv;
do_gettimeofday(&tv);
tod->sec = tv.tv_sec;
tod->msec = tv.tv_usec / 1000;
}
}

91
drivers/staging/csr/csr_time.h
View File

@ -75,32 +75,6 @@ typedef struct
CsrTime CsrTimeGet(CsrTime *high);
/*******************************************************************************
NAME
CsrTimeUtcGet
DESCRIPTION
Get the current system wallclock time, and optionally the current system
time in a low and a high part as would have been returned by
CsrTimeGet.
Although CsrTimeUtc is expressed in seconds and milliseconds, the actual
resolution is platform dependent, and can be less. It is recommended
that the resolution is at least 1 second.
PARAMETERS
tod - Pointer to variable that will receive the current system
wallclock time.
low - The low part of the current system time in microseconds. Passing
NULL is valid.
high - The high part of the current system time in microseconds. Passing
NULL is valid.
*******************************************************************************/
void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high);
/*------------------------------------------------------------------*/
/* CsrTime Macros */
/*------------------------------------------------------------------*/
@ -133,71 +107,6 @@ void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high);
*----------------------------------------------------------------------------*/
#define CsrTimeSub(t1, t2) ((s32) (t1) - (s32) (t2))
/*----------------------------------------------------------------------------*
* NAME
* CsrTimeEq
*
* DESCRIPTION
* Compare two time values.
*
* RETURNS
* !0 if "t1" equal "t2", else 0.
*
*----------------------------------------------------------------------------*/
#define CsrTimeEq(t1, t2) ((t1) == (t2))
/*----------------------------------------------------------------------------*
* NAME
* CsrTimeGt
*
* DESCRIPTION
* Compare two time values.
*
* RETURNS
* !0 if "t1" is greater than "t2", else 0.
*
*----------------------------------------------------------------------------*/
#define CsrTimeGt(t1, t2) (CsrTimeSub((t1), (t2)) > 0)
/*----------------------------------------------------------------------------*
* NAME
* CsrTimeGe
*
* DESCRIPTION
* Compare two time values.
*
* RETURNS
* !0 if "t1" is greater than, or equal to "t2", else 0.
*
*----------------------------------------------------------------------------*/
#define CsrTimeGe(t1, t2) (CsrTimeSub((t1), (t2)) >= 0)
/*----------------------------------------------------------------------------*
* NAME
* CsrTimeLt
*
* DESCRIPTION
* Compare two time values.
*
* RETURNS
* !0 if "t1" is less than "t2", else 0.
*
*----------------------------------------------------------------------------*/
#define CsrTimeLt(t1, t2) (CsrTimeSub((t1), (t2)) < 0)
/*----------------------------------------------------------------------------*
* NAME
* CsrTimeLe
*
* DESCRIPTION
* Compare two time values.
*
* RETURNS
* !0 if "t1" is less than, or equal to "t2", else 0.
*
*----------------------------------------------------------------------------*/
#define CsrTimeLe(t1, t2) (CsrTimeSub((t1), (t2)) <= 0)
#ifdef __cplusplus
}
#endif

10
drivers/staging/csr/csr_wifi_router_transport.c
View File

@ -50,16 +50,6 @@ void CsrWifiRouterTransportInit(unifi_priv_t *priv)
#endif
}
void CsrWifiRouterTransportDeinit(unifi_priv_t *priv)
{
unifi_trace(priv, UDBG1, "CsrWifiRouterTransportDeinit: \n");
if (priv == drvpriv)
{
CsrMsgConvDeinit();
drvpriv = NULL;
}
}
void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, size_t bufferLength)
{
CsrMsgConvMsgEntry* msgEntry;