From 6b21ba82909c72b2ca8aef7d8f99d715b2cdef3c Mon Sep 17 00:00:00 2001
From: ryuz <ryuz>
Date: Wed, 31 Oct 2007 01:57:19 +0000
Subject: [PATCH] (none)

---
 aplfw/driver/ether/lan9118/lan9118drv.h        |  1 -
 aplfw/driver/ether/lan9118/lan9118drv_create.c |  4 ++--
 aplfw/driver/ether/lan9118/lan9118drv_delete.c |  5 -----
 aplfw/driver/ether/lan9118/lan9118drv_open.c   |  2 +-
 aplfw/driver/serial/at91/at91usartdrv.h        |  2 +-
 aplfw/driver/serial/at91/at91usartdrv_create.c |  4 ++--
 aplfw/driver/serial/at91/at91usartdrv_open.c   |  2 +-
 aplfw/library/container/array/array.h          | 10 +++++-----
 8 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/aplfw/driver/ether/lan9118/lan9118drv.h b/aplfw/driver/ether/lan9118/lan9118drv.h
index d7fcb77..d458005 100755
--- a/aplfw/driver/ether/lan9118/lan9118drv.h
+++ b/aplfw/driver/ether/lan9118/lan9118drv.h
@@ -15,7 +15,6 @@
 
 #include "system/sysapi/sysapi.h"
 #include "system/file/chrdrv.h"
-#include "library/container/stmbuf/stmbuf.h"
 
 
 /* UARTドライバ制御部 */
diff --git a/aplfw/driver/ether/lan9118/lan9118drv_create.c b/aplfw/driver/ether/lan9118/lan9118drv_create.c
index 04d94ce..c1d36eb 100755
--- a/aplfw/driver/ether/lan9118/lan9118drv_create.c
+++ b/aplfw/driver/ether/lan9118/lan9118drv_create.c
@@ -38,8 +38,8 @@ void Lan9118Drv_Create(C_LAN9118DRV *self, void *pRegBase, int iIntNum)
 	self->iOpenCount  = 0;
 	
 	/* イベント生成 */
-	self->hEvtRecv = SysEvt_Create();
-	self->hEvtSend = SysEvt_Create();
+	self->hEvtRecv = SysEvt_Create(SYSEVT_MODE_AUTOCLEAR);
+	self->hEvtSend = SysEvt_Create(SYSEVT_MODE_AUTOCLEAR);
 
 	/* ミューテックス生成 */
 	self->hMtxSend = SysMtx_Create();
diff --git a/aplfw/driver/ether/lan9118/lan9118drv_delete.c b/aplfw/driver/ether/lan9118/lan9118drv_delete.c
index dbfc1bc..46b4001 100755
--- a/aplfw/driver/ether/lan9118/lan9118drv_delete.c
+++ b/aplfw/driver/ether/lan9118/lan9118drv_delete.c
@@ -26,11 +26,6 @@ void Lan9118Drv_Delete(C_DRVOBJ *pDrvObj)
 	SysEvt_Delete(self->hEvtSend);
 	SysMtx_Delete(self->hMtxRecv);
 	SysMtx_Delete(self->hMtxSend);
-
-	/* バッファ削除 */
-	pMem = StreamBuf_RefBufAddr(&self->StmBufRecv);
-	StreamBuf_Delete(&self->StmBuf);
-	SysMem_Free(pMem);
 }
 
 
diff --git a/aplfw/driver/ether/lan9118/lan9118drv_open.c b/aplfw/driver/ether/lan9118/lan9118drv_open.c
index f9f054a..089fe04 100755
--- a/aplfw/driver/ether/lan9118/lan9118drv_open.c
+++ b/aplfw/driver/ether/lan9118/lan9118drv_open.c
@@ -54,7 +54,7 @@ HANDLE Lan9118Drv_Open(C_DRVOBJ *pDrvObj, const char *pszPath, int iMode)
 	{
 		return HANDLE_NULL;
 	}
-	ChrFile_Create(pFile, pDrvObj, NULL);
+	ChrFile_Create(pFile, &self->ChrDrv, NULL);
 	
 	self->iOpenCount++;
 	
diff --git a/aplfw/driver/serial/at91/at91usartdrv.h b/aplfw/driver/serial/at91/at91usartdrv.h
index 500ab3f..fbf5b00 100755
--- a/aplfw/driver/serial/at91/at91usartdrv.h
+++ b/aplfw/driver/serial/at91/at91usartdrv.h
@@ -15,7 +15,7 @@
 
 #include "system/sysapi/sysapi.h"
 #include "system/file/chrdrv.h"
-#include "library/container/stmbuf/stmbuf.h"
+#include "library/container/streambuf/streambuf.h"
 
 
 /* UARTドライバ制御部 */
diff --git a/aplfw/driver/serial/at91/at91usartdrv_create.c b/aplfw/driver/serial/at91/at91usartdrv_create.c
index a421f67..b1ee1af 100755
--- a/aplfw/driver/serial/at91/at91usartdrv_create.c
+++ b/aplfw/driver/serial/at91/at91usartdrv_create.c
@@ -45,8 +45,8 @@ void At91UsartDrv_Create(C_AT91USARTDRV *self, void *pRegBase, int iIntNum, unsi
 	StreamBuf_Create(&self->StmBufRecv, iBufSize, pMem);
 
 	/* イベント生成 */
-	self->hEvtRecv = SysEvt_Create();
-	self->hEvtSend = SysEvt_Create();
+	self->hEvtRecv = SysEvt_Create(SYSEVT_MODE_AUTOCLEAR);
+	self->hEvtSend = SysEvt_Create(SYSEVT_MODE_AUTOCLEAR);
 
 	/* ミューテックス生成 */
 	self->hMtxSend = SysMtx_Create();
diff --git a/aplfw/driver/serial/at91/at91usartdrv_open.c b/aplfw/driver/serial/at91/at91usartdrv_open.c
index 76c0d20..5c9e3e0 100755
--- a/aplfw/driver/serial/at91/at91usartdrv_open.c
+++ b/aplfw/driver/serial/at91/at91usartdrv_open.c
@@ -26,7 +26,7 @@ HANDLE At91UsartDrv_Open(C_DRVOBJ *pDrvObj, const char *pszPath, int iMode)
 	{
 		return HANDLE_NULL;
 	}
-	ChrFile_Create(pChrFile, pDrvObj, NULL);
+	ChrFile_Create(pChrFile, &self->ChrDrv, NULL);
 
 	
 	/* オープン処理 */
diff --git a/aplfw/library/container/array/array.h b/aplfw/library/container/array/array.h
index ece3a00..161e7cd 100755
--- a/aplfw/library/container/array/array.h
+++ b/aplfw/library/container/array/array.h
@@ -29,10 +29,10 @@ typedef int		ARRAY_INDEX;
 /* ストリームバッファクラス */
 typedef struct c_array
 {
-	const T_MEMIF *pMemIf;		/* 利用するメモリI/F */
-	void          **ppArray;	/* データ配列 */
-	ARRAY_INDEX   ArraySize;	/* 配列サイズ */
-	ARRAY_INDEX   Size;			/* 配列要素のサイズ */
+	C_MEMIF		*pMemIf;	/* 利用するメモリI/F */
+	void		**ppArray;	/* データ配列 */
+	ARRAY_INDEX	ArraySize;	/* 配列サイズ */
+	ARRAY_INDEX	Size;		/* 配列要素のサイズ */
 } C_ARRAY;
 
 
@@ -42,7 +42,7 @@ extern "C" {
 
 /* 生成／削除 */
 void        Array_Create(C_ARRAY *self);													/* 配列クラスの生成 */
-void        Array_CreateEx(C_ARRAY *self, const T_MEMIF *pMemIf);							/* 配列クラスの生成 */
+void        Array_CreateEx(C_ARRAY *self, C_MEMIF *pMemIf);							/* 配列クラスの生成 */
 void        Array_Delete(C_ARRAY *self);													/* 配列クラスの削除 */
 
 /* 操作 */
-- 
2.11.0