VirtualBox

Changeset 24386 in vbox for trunk/src/VBox/Runtime/r0drv


Ignore:
Timestamp:
Nov 5, 2009 2:17:10 PM (15 years ago)
Author:
vboxsync
Message:

Solaris/r0drv: Merge VBI into IPRT.

Location:
trunk/src/VBox/Runtime/r0drv/solaris
Files:
11 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c

    r22556 r24386  
    5252{
    5353    /*
    54      * Detech whether spl*() is preserving the interrupt flag or not.
    55      * This is a problem on S10.
     54     * Initialize vbi (keeping it separate for now)
    5655     */
    57     RTCCUINTREG uOldFlags = ASMIntDisableFlags();
    58     int iOld = splr(DISP_LEVEL);
    59     if (ASMIntAreEnabled())
    60         g_frtSolarisSplSetsEIF = true;
    61     splx(iOld);
    62     if (ASMIntAreEnabled())
    63         g_frtSolarisSplSetsEIF = true;
    64     ASMSetFlags(uOldFlags);
     56    int rc = vbi_init();
     57    if (!rc)
     58    {
     59        /*
     60         * Detech whether spl*() is preserving the interrupt flag or not.
     61         * This is a problem on S10.
     62         */
     63        RTCCUINTREG uOldFlags = ASMIntDisableFlags();
     64        int iOld = splr(DISP_LEVEL);
     65        if (ASMIntAreEnabled())
     66            g_frtSolarisSplSetsEIF = true;
     67        splx(iOld);
     68        if (ASMIntAreEnabled())
     69            g_frtSolarisSplSetsEIF = true;
     70        ASMSetFlags(uOldFlags);
    6571
    66     return VINF_SUCCESS;
     72        return VINF_SUCCESS;
     73    }
     74    cmn_err(CE_NOTE, "vbi_init failed. rc=%d\n", rc);
     75    return VERR_GENERAL_FAILURE;
    6776}
    6877

  • trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

    r22991 r24386  
    5959#include <sys/spl.h>
    6060#include <sys/archsystm.h>
     61#include "vbi.h"
    6162
    6263#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
    … …  
    6667
    6768RT_C_DECLS_BEGIN
    68 extern bool                 g_frtSolarisSplSetsEIF;
    69 extern struct ddi_dma_attr  g_SolarisX86PhysMemLimits;
     69extern bool g_frtSolarisSplSetsEIF;
     70extern struct ddi_dma_attr g_SolarisX86PhysMemLimits;
    7071extern uintptr_t kernelbase;
     72extern RTCPUSET g_rtMpSolarisCpuSet;
    7173RT_C_DECLS_END
    7274

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/RTMpPokeCpu-r0drv-solaris.c

    r22073 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/mp.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c

    r22073 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/mem.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

    r21452 r24386  
    187187/* End of v6 intro */
    188188
    189 
     189#if 0
    190190int
    191191_init(void)
     192{
     193    int err = vbi_init();
     194    if (!err)
     195        err = mod_install(&vbi_modlinkage);
     196        return (err);
     197}
     198#endif
     199
     200int
     201vbi_init(void)
    192202{
    193203        int err;
    … …  
    266276                return EINVAL;
    267277        }
    268 
    269         err = mod_install(&vbi_modlinkage);
    270         if (err != 0)
    271                 return (err);
    272 
    273278        return (0);
    274279}
    275280
     281#if 0
    276282int
    277283_fini(void)
    … …  
    289295        return (mod_info(&vbi_modlinkage, modinfop));
    290296}
     297#endif
     298
    291299
    292300static ddi_dma_attr_t base_attr = {

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c

    r24247 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/memobj.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c

    r22347 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/mp.h>
     38#include <iprt/cpuset.h>
    3839
    3940#include <iprt/asm.h>
    4041#include <iprt/err.h>
    41 #include "internal-r0drv-solaris.h"
    4242#include "r0drv/mp-r0drv.h"
    4343

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c

    r22439 r24386  
    3232*   Header Files                                                               *
    3333*******************************************************************************/
    34 #include "the-solaris-kernel.h"
     34#include "../the-solaris-kernel.h"
    3535#include "internal/iprt.h"
    3636
    3737#include <iprt/err.h>
    3838#include <iprt/mp.h>
     39#include <iprt/cpuset.h>
    3940#include "r0drv/mp-r0drv.h"
    40 #include "internal-r0drv-solaris.h"
    4141
    4242

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c

    r22073 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/process.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c

    r23505 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/thread.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c

    r22073 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/thread.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c

    r22073 r24386  
    3434*******************************************************************************/
    3535#define RTTIME_INCL_TIMESPEC
    36 #include "the-solaris-kernel.h"
     36#include "../the-solaris-kernel.h"
    3737#include "internal/iprt.h"
    3838#include <iprt/time.h>

  • trunk/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c

    r22073 r24386  
    3333*   Header Files                                                               *
    3434*******************************************************************************/
    35 #include "the-solaris-kernel.h"
     35#include "../the-solaris-kernel.h"
    3636#include "internal/iprt.h"
    3737#include <iprt/timer.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette