From: John Hodge Date: Mon, 24 May 2010 05:35:04 +0000 (+0800) Subject: Working on UDI support X-Git-Tag: rel0.06~182 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=ce6600aced3a83a091674af23620b250e27480a9;p=tpg%2Facess2.git Working on UDI support --- diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index 70cc0b33..5260c857 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 2159 +BUILD_NUM = 2161 diff --git a/Modules/Filesystems/Ext2/dir.c b/Modules/Filesystems/Ext2/dir.c index 1832ff97..cf6fda44 100644 --- a/Modules/Filesystems/Ext2/dir.c +++ b/Modules/Filesystems/Ext2/dir.c @@ -153,10 +153,13 @@ tVFS_Node *Ext2_FindDir(tVFS_Node *Node, char *Filename) */ int Ext2_MkNod(tVFS_Node *Parent, char *Name, Uint Flags) { + #if 0 tVFS_Node *child; - child = Ext2_int_AllocateNode(Parent, Flags); return Ext2_Link(Parent, child, Name); + #else + return 0; + #endif } /** diff --git a/Modules/Interfaces/UDI/buf.c b/Modules/Interfaces/UDI/buf.c index 3255911d..5327cc8b 100644 --- a/Modules/Interfaces/UDI/buf.c +++ b/Modules/Interfaces/UDI/buf.c @@ -1,6 +1,8 @@ /** * \file buf.c * \author John Hodge (thePowersGang) + * + * Buffer Manipulation */ #include #include @@ -27,6 +29,18 @@ void udi_buf_copy( UNIMPLEMENTED(); } +/** + * \brief Write to a buffer + * \param callback Function to call once the write has completed + * \param gcb Control Block + * \param src_mem Source Data + * \param src_len Length of source data + * \param dst_buf Destination buffer + * \param dst_off Destination offset in the buffer + * \param dst_len Length of destination area (What the?, Redundant + * Department of redundacny department) + * \param path_handle ??? + */ void udi_buf_write( udi_buf_write_call_t *callback, udi_cb_t *gcb, diff --git a/Modules/Interfaces/UDI/include/udi/init.h b/Modules/Interfaces/UDI/include/udi/init.h index f405d036..a6d5bb48 100644 --- a/Modules/Interfaces/UDI/include/udi/init.h +++ b/Modules/Interfaces/UDI/include/udi/init.h @@ -196,7 +196,7 @@ struct udi_ops_init_s /** * \brief Flags for each entry in \a ops_vector */ - const udi_ubit8_t *op_flags; + //const udi_ubit8_t *op_flags; }; /** diff --git a/Modules/Interfaces/UDI/main.c b/Modules/Interfaces/UDI/main.c index a6fed922..eff960cf 100644 --- a/Modules/Interfaces/UDI/main.c +++ b/Modules/Interfaces/UDI/main.c @@ -52,7 +52,7 @@ int UDI_LoadDriver(void *Base) int i; // int j; - Log("UDI_LoadDriver: (Base=%p)", Base); + Log_Debug("UDI", "UDI_LoadDriver: (Base=%p)", Base); if( Binary_FindSymbol(Base, "udi_init_info", (Uint*)&info) == 0) { Binary_Unload(Base); @@ -60,11 +60,12 @@ int UDI_LoadDriver(void *Base) } if( Binary_FindSymbol(Base, "_udiprops", (Uint*)&udiprops) == 0 ) { - Warning("[UDI ] _udiprops is not defined, this is usually bad"); + Log_Warning("UDI", "_udiprops is not defined, this is usually bad"); } else { - Binary_FindSymbol(Base, "_udiprops_size", (Uint*)&udiprops_size); - Log("udiprops = %p, udiprops_size = 0x%x", udiprops, udiprops_size); + if( Binary_FindSymbol(Base, "_udiprops_size", (Uint*)&udiprops_size) == 0) + Log_Warning("UDI", "_udiprops_size is not defined"); + Log_Log("UDI", "udiprops = %p, udiprops_size = 0x%x", udiprops, udiprops_size); } @@ -106,7 +107,7 @@ int UDI_LoadDriver(void *Base) Log(" .meta_ops_num = 0x%x", info->ops_init_list[i].meta_ops_num); Log(" .chan_context_size = 0x%x", info->ops_init_list[i].chan_context_size); Log(" .ops_vector = %p", info->ops_init_list[i].ops_vector); - Log(" .op_flags = %p", info->ops_init_list[i].op_flags); +// Log(" .op_flags = %p", info->ops_init_list[i].op_flags); Log("}"); }