Changeset 3578 for trunk/kStuff/include/k/kLdr.h

Timestamp:

Sep 2, 2007, 10:55:51 PM (18 years ago)

Author:

bird

Message:

kLdrRdr cleanup.

File:

• trunk/kStuff/include/k/kLdr.h (modified) (5 diffs)

trunk/kStuff/include/k/kLdr.h

@@ -161 +161 @@
 typedef const KLDRPU *PCKLDRPU;
 
-
-/** Pointer to a loader segment. */
-typedef struct KLDRSEG *PKLDRSEG;
-/** Pointer to a loader segment. */
-typedef const struct KLDRSEG *PCKLDRSEG;
-
-/** @} */
-
-
-/** @defgroup grp_kLdrRdr   kLdrRdr - The file provider
- * @{ */
-
-/** Pointer to a file provider instance core. */
-typedef struct KLDRRDR *PKLDRRDR;
-/** Pointer to a file provider instance core pointer. */
-typedef struct KLDRRDR **PPKLDRRDR;
-
-/**
- * File provider instance operations.
- */
-typedef struct KLDRRDROPS
-{
-    /** The name of this file provider. */
-    const char *pszName;
-    /** Pointer to the next file provider. */
-    const struct KLDRRDROPS *pNext;
-
-    /** Try create a new file provider instance.
-     *
-     * @returns 0 on success, OS specific error code on failure.
-     * @param   ppRdr       Where to store the file provider instance.
-     * @param   pszFilename The filename to open.
-     */
-    int     (* pfnCreate)(  PPKLDRRDR ppRdr, const char *pszFilename);
-    /** Destroy the file provider instance.
-     *
-     * @returns 0 on success, OS specific error code on failure.
-     *          On failure, the file provider instance will be in an indeterminate state - don't touch it!
-     * @param   pRdr        The file provider instance.
-     */
-    int     (* pfnDestroy)( PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrRead */
-    int     (* pfnRead)(    PKLDRRDR pRdr, void *pvBuf, KSIZE cb, KLDRFOFF off);
-    /** @copydoc kLdrRdrAllMap */
-    int     (* pfnAllMap)(  PKLDRRDR pRdr, const void **ppvBits);
-    /** @copydoc kLdrRdrAllUnmap */
-    int     (* pfnAllUnmap)(PKLDRRDR pRdr, const void *pvBits);
-    /** @copydoc kLdrRdrSize */
-    KLDRFOFF (* pfnSize)(    PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrTell */
-    KLDRFOFF (* pfnTell)(    PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrName */
-    const char * (* pfnName)(PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrPageSize */
-    KSIZE   (* pfnPageSize)(PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrMap */
-    int     (* pfnMap)(     PKLDRRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
-    /** @copydoc kLdrRdrRefresh */
-    int     (* pfnRefresh)( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-    /** @copydoc kLdrRdrProtect */
-    int     (* pfnProtect)( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
-    /** @copydoc kLdrRdrUnmap */
-    int     (* pfnUnmap)(   PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-    /** @copydoc kLdrRdrDone */
-    void    (* pfnDone)(    PKLDRRDR pRdr);
-    /** The usual non-zero dummy that makes sure we've initialized all members. */
-    KU32 u32Dummy;
-} KLDRRDROPS;
-/** Pointer to file provider operations. */
-typedef KLDRRDROPS *PKLDRRDROPS;
-/** Pointer to const file provider operations. */
-typedef const KLDRRDROPS *PCKLDRRDROPS;
-
-
-/**
- * File provider instance core.
- */
-typedef struct KLDRRDR
-{
-    /** Magic number (KLDRRDR_MAGIC). */
-    KU32         u32Magic;
-    /** Pointer to the file provider operations. */
-    PCKLDRRDROPS pOps;
-} KLDRRDR;
-
-/** The magic for KLDRRDR::u32Magic. (Katsu Aki (Katsuaki Nakamura)) */
-#define KLDRRDR_MAGIC   0x19610919
-
-void    kLdrRdrAddProvider(PKLDRRDROPS pAdd);
-
-int     kLdrRdrOpen(    PPKLDRRDR ppRdr, const char *pszFilename);
-int     kLdrRdrClose(   PKLDRRDR pRdr);
-int     kLdrRdrRead(    PKLDRRDR pRdr, void *pvBuf, KSIZE cb, KLDRFOFF off);
-int     kLdrRdrAllMap(  PKLDRRDR pRdr, const void **ppvBits);
-int     kLdrRdrAllUnmap(PKLDRRDR pRdr, const void *pvBits);
-KLDRFOFF kLdrRdrSize(    PKLDRRDR pRdr);
-KLDRFOFF kLdrRdrTell(    PKLDRRDR pRdr);
-const char *kLdrRdrName(PKLDRRDR pRdr);
-KSIZE   kLdrRdrPageSize(PKLDRRDR pRdr);
-int     kLdrRdrMap(     PKLDRRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fFixed);
-int     kLdrRdrRefresh( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-int     kLdrRdrProtect( PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
-int     kLdrRdrUnmap(   PKLDRRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
-void    kLdrRdrDone(    PKLDRRDR pRdr);
-
-/** @} */
-
+/** @} */
 
 
@@ -613 +507 @@
     PCKLDRMODOPS        pOps;
     /** Pointer to the read instance. (Can be NULL after kLdrModDone().)*/
-    PKLDRRDR            pRdr;
+    PKRDR               pRdr;
     /** The module data. */
     void               *pvData;
@@ -798 +692 @@
 
 int     kLdrModOpen(const char *pszFilename, PPKLDRMOD ppMod);
-int     kLdrModOpenFromRdr(PKLDRRDR pRdr, PPKLDRMOD ppMod);
+int     kLdrModOpenFromRdr(PKRDR pRdr, PPKLDRMOD ppMod);
 int     kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod);
 int     kLdrModOpenNativeByHandle(KUPTR uHandle, PPKLDRMOD ppMod);
@@ -865 +759 @@
      * @param   ppMod           Where to store the module instance pointer.
      */
-    int (* pfnCreate)(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
+    int (* pfnCreate)(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
     /**
      * Destroys an loader module instance.
@@ -911 +805 @@
     int (* pfnAllocTLS)(PKLDRMOD pMod);
     /** @copydoc kLdrModFreeTLS */
-    void (* pfnFreeTLS)(PKLDRMOD pMod);
+    void (*pfnFreeTLS)(PKLDRMOD pMod);
     /** @copydoc kLdrModReload */
     int (* pfnReload)(PKLDRMOD pMod);