X-Git-Url: http://git.osdn.net/view?p=mimic%2FMiMicSDK.git;a=blobdiff_plain;f=lib%2Fsrc%2Fdriver%2Fethernet%2FNyLPC_IEthernetDevice.h;fp=lib%2Fsrc%2Fdriver%2Fethernet%2FNyLPC_IEthernetDevice.h;h=09577cae7554c6d2060dce6a875a460fe9282c70;hp=b965a4c84dc452606c1f5a386326dcd022e7b547;hb=6f577ed92e46bc8bf0463a7330ff698ec75853f2;hpb=46823da6b6b38411dd4dc824f9ec8deeb1134d74 diff --git a/lib/src/driver/ethernet/NyLPC_IEthernetDevice.h b/lib/src/driver/ethernet/NyLPC_IEthernetDevice.h index b965a4c..09577ca 100644 --- a/lib/src/driver/ethernet/NyLPC_IEthernetDevice.h +++ b/lib/src/driver/ethernet/NyLPC_IEthernetDevice.h @@ -1,18 +1,21 @@ /* * NyLPC_IEthernetDevice.h * - * Created on: 2011/12/06 + * Created: 2011/12/06 * MiMicã®ã¤ã¼ãµããããã©ã¤ãã¤ã³ã¿ãã§ã¤ã¹ãå®ç¾©ããã */ #ifndef NyLPC_IEthernetDevice_h #define NyLPC_IEthernetDevice_h #include "NyLPC_stdlib.h" -#include "NyLPC_uipService.h" +#include "../../netif/NyLPC_NetIf_ip_types.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ + + typedef struct NyLPC_TiEthernetDevice NyLPC_TiEthernetDevice_t; /**éåæã¤ãã³ãã®ã¡ãã»ã¼ã¸ã¿ã¤ã*/ @@ -29,24 +32,6 @@ typedef unsigned int NyLPC_TiEthernetDevice_EVENT; typedef void (*NyLPC_TiEthernetDevice_onEvent)(void* i_param,NyLPC_TiEthernetDevice_EVENT i_type); -/** - * éä¿¡ãããã¡ã¢ãªã®ãããã - * ãã®æ§é ä½ã¯ãTXãããã¡ã¡ã¢ãªãããã¯ã®ãããã¼ã§ãã - * TXãããã¡ã¡ã¢ãªãããã¯ã¯ããã®æ§é ä½ã®å¾ãã«ãsizeã«ä¸è´ããã¡ã¢ãªãé£çµãããã®ã§è¡¨ç¾ãã¾ãã - *
- * buffer=[struct NyLPC_TTxBufferHeader][n] - *- */ -struct NyLPC_TTxBufferHeader -{ - //ã¡ã¢ãªãããã¯ã®åç §ã«ã¦ã³ã¿ã - NyLPC_TInt8 ref; - //éä¿¡ç¨ã«ããã¯ãããã示ããã©ã° - NyLPC_TUInt8 is_lock; - //32ãããå¢çã«åãããããã®ããã£ã³ã°ã - NyLPC_TUInt16 padding; -}; - /** @@ -82,7 +67,7 @@ typedef void (*NyLPC_TiEthernetDevice_nextRxEthFrame)(void); * å²ãå½ã¦ãã¡ã¢ãªãããã¯ã®ãããã */ #define NyLPC_iEthernetDevice_allocTxBuf(i,h,s) (i)->allocTxBuf((h),(s)) -typedef struct NyLPC_TTxBufferHeader* (*NyLPC_TiEthernetDevice_allocTxBuf)(NyLPC_TUInt16 i_hint,NyLPC_TUInt16* o_size); +typedef void* (*NyLPC_TiEthernetDevice_allocTxBuf)(NyLPC_TUInt16 i_hint,NyLPC_TUInt16* o_size); /** @@ -90,7 +75,7 @@ typedef struct NyLPC_TTxBufferHeader* (*NyLPC_TiEthernetDevice_allocTxBuf)(NyLPC * é¢æ°ã¯ãã¡ã¢ãªãããã¯ã®åç §ã«ã¦ã³ã¿ã1æ¸ç®ããã */ #define NyLPC_iEthernetDevice_releaseTxBuf(i,b) (i)->releaseTxBuf(b) -typedef void (*NyLPC_TiEthernetDevice_releaseTxBuf)(struct NyLPC_TTxBufferHeader* i_buf); +typedef void (*NyLPC_TiEthernetDevice_releaseTxBuf)(void* i_buf); @@ -99,12 +84,11 @@ typedef void (*NyLPC_TiEthernetDevice_releaseTxBuf)(struct NyLPC_TTxBufferHeader * @param i_buf * allocTxBufã§å¾ãã¡ã¢ãªããåæåããNyLPC_TTxBufferHeaderã¡ã¢ãªãããã¯ãæå®ããã * éä¿¡ãçµããã¾ã§ã®éãã¡ã¢ãªãéæ¾ãã¦ã¯ãªããªãã - * #å¤é¨ã§ç¢ºä¿ããã¡ã¢ãªã«ã¤ãã¦ã¯ãå©ç¨ä¸è½ãªã±ã¼ã¹ããããããããªããç¾å¨ã®MiMicã§ã¯ã使ç¨ã§ãããã¨ãåæã¨ãã¦ããã * @oaram i_size * i_bufã®å¾ãã«é£çµããã¦ãããã¼ã¿ã¡ã¢ãªã®é·ã */ #define NyLPC_iEthernetDevice_sendTxEthFrame(i,b,s) (i)->sendTxEthFrame((b),(s)) -typedef void (*NyLPC_TiEthernetDevice_sendTxEthFrame)(struct NyLPC_TTxBufferHeader* i_buf,unsigned short i_size); +typedef void (*NyLPC_TiEthernetDevice_sendTxEthFrame)(void* i_buf,unsigned short i_size); /**