(none)

diff --git a/aplfw/driver/console/vt100/vt100drv.h b/aplfw/driver/console/vt100/vt100drv.h
index 163b0a0..fed9e5d 100755 (executable)
--- a/aplfw/driver/console/vt100/vt100drv.h
+++ b/aplfw/driver/console/vt100/vt100drv.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 void      Vt100Drv_Create(C_VT100DRV *self, HANDLE hTty);                                      /**< コンストラクタ */
-void      Vt100Drv_Delete(C_VT100DRV *self);                                                           /**< デストラクタ */
+void      Vt100Drv_Delete(C_DRVOBJ *pDrvObj);                                                          /**< デストラクタ */
 
 #ifdef __cplusplus
 }

diff --git a/aplfw/driver/console/vt100/vt100drv_create.c b/aplfw/driver/console/vt100/vt100drv_create.c
index 5634d2f..22db8d3 100755 (executable)
--- a/aplfw/driver/console/vt100/vt100drv_create.c
+++ b/aplfw/driver/console/vt100/vt100drv_create.c
@@ -15,6 +15,7 @@
 
 const T_DRVOBJ_METHODS  Vt100Drv_Methods = 
        {
+               Vt100Drv_Delete,
                Vt100Drv_Open,
                Vt100Drv_Close,
                Vt100Drv_IoControl,

diff --git a/aplfw/driver/console/vt100/vt100drv_delete.c b/aplfw/driver/console/vt100/vt100drv_delete.c
new file mode 100755 (executable)
index 0000000..eff7329
--- /dev/null
+++ b/aplfw/driver/console/vt100/vt100drv_delete.c
@@ -0,0 +1,29 @@
+/** 
+ *  Hyper Operating System  Application Framework
+ *
+ * @file  vt100drv_create.c
+ * @brief %jp{VT100 ターミナルドライバ}
+ *
+ * Copyright (C) 2006 by Project HOS
+ * http://sourceforge.jp/projects/hos/
+ */
+
+
+#include "vt100drv_local.h"
+#include "system/sysapi/sysapi.h"
+
+
+/** デストラクタ */
+void Vt100Drv_Delete(C_DRVOBJ *pDrvObj)
+{
+       C_VT100DRV                      *self;
+       
+       /* upper cast */
+       self = (C_VT100DRV *)pDrvObj;
+
+       /* 親クラスデストラクタ */
+       DrvObj_Delete(&self->DrvObj);
+}
+
+
+/* end of file */

diff --git a/aplfw/driver/serial/winsock/winsockdrv.c b/aplfw/driver/serial/winsock/winsockdrv.c
index 99ea390..da80c55 100755 (executable)
--- a/aplfw/driver/serial/winsock/winsockdrv.c
+++ b/aplfw/driver/serial/winsock/winsockdrv.c
@@ -6,6 +6,7 @@
 
 const T_DRVOBJ_METHODS  WinSockDrv_Methods = 
        {
+               WinSockDrv_Delete,
                WinSockDrv_Open,
                WinSockDrv_Close,
                WinSockDrv_IoControl,
@@ -40,7 +41,7 @@ void WinSockDrv_Create(C_WINSOCKDRV *self, int iPortNum, int iIntNum, int iBufSi
 
 
 /** デストラクタ */
-void WinSockDrv_Delete(C_WINSOCKDRV *self)
+void WinSockDrv_Delete(C_DRVOBJ *pDrvObj)
 {
        WSACleanup();
 }

diff --git a/aplfw/driver/serial/winsock/winsockdrv.h b/aplfw/driver/serial/winsock/winsockdrv.h
index 16cf2c2..d6adfa6 100755 (executable)
--- a/aplfw/driver/serial/winsock/winsockdrv.h
+++ b/aplfw/driver/serial/winsock/winsockdrv.h
@@ -44,6 +44,7 @@ extern "C" {
 #endif
 
 void WinSockDrv_Create(C_WINSOCKDRV *self, int iPortNum, int iIntNum, int iBufSize);           /**< コンストラクタ */
+void WinSockDrv_Delete(C_DRVOBJ *pDrvObj);                                                                                                     /**< デストラクタ */
 
 #ifdef __cplusplus
 }

diff --git a/aplfw/system/file/drvobj.h b/aplfw/system/file/drvobj.h
index 2ca7f9e..2b4b3a1 100755 (executable)
--- a/aplfw/system/file/drvobj.h
+++ b/aplfw/system/file/drvobj.h
@@ -20,6 +20,7 @@ struct c_drvobj;
 /* デバイスドライバオブジェクト基本クラス メソッドテーブル */
 typedef struct t_drvobj_methods
 {
+       void      (*pfncDelete)(struct c_drvobj *self);
        HANDLE    (*pfncOpen)(struct c_drvobj *self, const char *pszPath, int iMode);
        FILE_ERR  (*pfncClose)(struct c_drvobj *self, C_FILEOBJ *pFileObj);
        FILE_ERR  (*pfncIoControl)(struct c_drvobj *self, C_FILEOBJ *pFileObj, int iFunc, void *pInBuf, FILE_SIZE InSize, const void *pOutBuf, FILE_SIZE OutSize);

diff --git a/aplfw/system/file/drvobj_delete.c b/aplfw/system/file/drvobj_delete.c
new file mode 100755 (executable)
index 0000000..132ab73
--- /dev/null
+++ b/aplfw/system/file/drvobj_delete.c
@@ -0,0 +1,10 @@
+
+#include "drvobj_local.h"
+
+
+/**< デストラクタ */
+void DrvObj_Delete(C_DRVOBJ *self)
+{
+}
+
+