VirtualBox

Changeset 33676 in vbox


Ignore:
Timestamp:
Nov 2, 2010 9:48:24 AM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
67299
Message:

scm cleanup run.

Location:
trunk
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • trunk/.scm-settings

    r32394 r33676  
    6363--filter-out-dirs  "*/src/VBox/Devices/PC/Etherboot-src/*/."
    6464--filter-out-dirs  "*/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/*/."
     65--filter-out-dirs  "*/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/."
     66--filter-out-dirs  "*/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeControllerDxe/."
    6567--filter-out-dirs  "*/src/VBox/Devices/Network/lwip/."
    66 --filter-out-dirs  "*/src/VBox/Devices/Storage/VBoxHDDFormats/StorageCraft/*/."
     68--filter-out-dirs  "*/src/VBox/Storage/VDFormats/StorageCraft/*/."
    6769--filter-out-dirs  "*/src/VBox/RDP/client/."
    6870--filter-out-dirs  "*/src/recompiler/tests/."

  • trunk/include/VBox/ExtPack/ExtPack.h

    r33623 r33676  
    196196#endif
    197197
    198 

  • trunk/include/VBox/VMMDev.h

    r33540 r33676  
    347347 * size of cursor, including the trailing cursor image and mask data.
    348348 * @note an "empty" request still has the four preallocated bytes of data
    349  * 
     349 *
    350350 * @returns the size
    351351 * @param  width   the cursor width

  • trunk/include/VBox/com/defs.h

    r33385 r33676  
    4141#  undef RT_MAX
    4242#  define REDEFINE_RT_MAX
    43 # endif   
     43# endif
    4444# undef RT_MAX
    4545
    … …  
    5555
    5656/* */
    57 # undef RT_MAX 
     57# undef RT_MAX
    5858# ifdef REDEFINE_RT_MAX
    5959#  define RT_MAX(Value1, Value2)                  ( (Value1) >= (Value2) ? (Value1) : (Value2) )

  • trunk/include/iprt/symlink.h

    r33426 r33676  
    150150#endif
    151151
    152 

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

    r33616 r33676  
    34763476        pDevice->aStreamSource[pData->Stream] = NULL;
    34773477    }
    3478    
     3478
    34793479    vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
    34803480    return hr;

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

    r33146 r33676  
    7878  VBoxVideoWddm_DEFS      += VBOXWDDM_RENDER_FROM_SHADOW
    7979  ifdef VBOXVDMA_WITH_VBVA
    80    VBoxVideoWddm_DEFS     += VBOXVDMA_WITH_VBVA 
     80   VBoxVideoWddm_DEFS     += VBOXVDMA_WITH_VBVA
    8181  endif
    8282 endif
    8383 ifdef VBOX_WITH_VDMA
    84   VBoxVideoWddm_DEFS     += VBOX_WITH_VDMA 
     84  VBoxVideoWddm_DEFS     += VBOX_WITH_VDMA
    8585 endif
    8686 ifdef VBOX_WITH_CRHGSMI
    8787  VBoxVideoWddm_DEFS     += VBOX_WITH_CRHGSMI
    8888 endif
    89  
     89
    9090 ifdef DEBUG_misha
    9191  VBoxVideoWddm_DEFS       += LOG_ENABLED

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

    r33628 r33676  
    19171917    else
    19181918        pDevExt->fAnyX = FALSE;
    1919    
     1919
    19201920    vboxVideoInitCustomVideoModes(pDevExt);
    19211921

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

    r33628 r33676  
    237237
    238238    /* The IO Port Number for guest commands. */
    239     RTIOPORT IOPortGuest;   
     239    RTIOPORT IOPortGuest;
    240240} VBOXVIDEO_COMMON, *PVBOXVIDEO_COMMON;
    241241

  • trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

    r33395 r33676  
    115115        VBoxGuest2.cpp
    116116 endif # OS/2
    117  
     117
    118118 VBoxGuest2.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
    119119 VBoxGuest.cpp_DEFS     = VBOX_SVN_REV=$(VBOX_SVN_REV)

  • trunk/src/VBox/Devices/Audio/DevCodec.cpp

    r33629 r33676  
    432432            pNode->node.au32F00_param[4] = (1 << 16)|0x1; /* start node 1, total 1*/
    433433            pNode->node.au32F00_param[0xA] = pState->pNodes[1].node.au32F00_param[0xA];
    434            
     434
    435435            break;
    436436        case 0x1: /* AFG */
    437437            pNode->node.au32F00_param[4] = (2 << 16)|0x25; /* start node 1, total 1*/
    438             pNode->node.au32F00_param[5] = RT_BIT(8) | 0x1; /* UnSol: enabled, function group type: AFG */ 
     438            pNode->node.au32F00_param[5] = RT_BIT(8) | 0x1; /* UnSol: enabled, function group type: AFG */
    439439            pNode->afg.u32F20_param = pState->u16VendorId << 16 | pState->u16DeviceId;
    440440            pNode->node.au32F00_param[0xB] = 0x1;
    … …  
    601601            pNode->port.u32F1c_param = 0x400000f0;
    602602            pNode->node.au32F00_param[0xC] = RT_BIT(13)|RT_BIT(12)|RT_BIT(11)|RT_BIT(10)|RT_BIT(9)|RT_BIT(8)|RT_BIT(5)|RT_BIT(4)|RT_BIT(3)|RT_BIT(2);
    603         port_init:   
     603        port_init:
    604604            pNode->node.au32F00_param[0x9] = 0x40018f;
    605605            pNode->node.au32F00_param[0xD] = 0x270300;
    … …  
    19101910
    19111911    /* 44.1 kHz */
    1912     as.freq = 44100; 
     1912    as.freq = 44100;
    19131913    as.nchannels = 2;
    19141914    as.fmt = AUD_FMT_S16;
    … …  
    19271927    #define IS_FORMAT_SUPPORTED_BY_HOST(pState, base, mult, div) (AUDIO_FORMAT_SELECTOR((pState), Out, (base), (mult), (div)) \
    19281928        && AUDIO_FORMAT_SELECTOR((pState), In, (base), (mult), (div)))
    1929    
     1929
    19301930    pState->pNodes[1].node.au32F00_param[0xA] = RT_BIT(17); /* 16-bit samples */
    19311931    SETUP_AUDIO_FORMAT(pState, AFMT_HZ_44_1K, AFMT_MULT_X1, AFMT_DIV_X1, "hda44_1", as, pi_callback, po_callback);
    … …  
    19411941    pState->pNodes[1].node.au32F00_param[0xA] |= IS_FORMAT_SUPPORTED_BY_HOST(pState, AFMT_HZ_44_1K, AFMT_MULT_X4, AFMT_DIV_X1) ? RT_BIT(9) : 0;
    19421942
    1943     as.freq = 48000; 
     1943    as.freq = 48000;
    19441944    SETUP_AUDIO_FORMAT(pState, AFMT_HZ_48K, AFMT_MULT_X1, AFMT_DIV_X1, "hda48", as, pi_callback, po_callback);
    19451945    pState->pNodes[1].node.au32F00_param[0xA] |= IS_FORMAT_SUPPORTED_BY_HOST(pState, AFMT_HZ_48K, AFMT_MULT_X1, AFMT_DIV_X1) ? RT_BIT(6) : 0;

  • trunk/src/VBox/Devices/Audio/DevCodec.h

    r33400 r33676  
    241241
    242242#ifdef VBOX_WITH_AUDIO_FLEXIBLE_FORMAT
    243 # define MAX_AUDIO_FORMAT 64 
     243# define MAX_AUDIO_FORMAT 64
    244244typedef SWVoiceIn *CODECAUDIOINFORMAT[MAX_AUDIO_FORMAT];
    245245typedef SWVoiceOut *CODECAUDIOOUTFORMAT[MAX_AUDIO_FORMAT];

  • trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

    r32726 r33676  
    15791579    PCIDevSetDeviceId           (&pThis->dev, 0x2415); /* 02 ro - 82801 / 82801aa(?). */Assert (pThis->dev.config[0x02] == 0x15); Assert (pThis->dev.config[0x03] == 0x24);
    15801580    PCIDevSetCommand            (&pThis->dev, 0x0000); /* 04 rw,ro - pcicmd. */         Assert (pThis->dev.config[0x04] == 0x00); Assert (pThis->dev.config[0x05] == 0x00);
    1581     PCIDevSetStatus             (&pThis->dev, 
     1581    PCIDevSetStatus             (&pThis->dev,
    15821582           VBOX_PCI_STATUS_DEVSEL_MEDIUM |  VBOX_PCI_STATUS_FAST_BACK); /* 06 rwc?,ro? - pcists. */      Assert (pThis->dev.config[0x06] == 0x80); Assert (pThis->dev.config[0x07] == 0x02);
    15831583    PCIDevSetRevisionId         (&pThis->dev, 0x01);   /* 08 ro - rid. */               Assert (pThis->dev.config[0x08] == 0x01);

  • trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsMisc.c

    r33595 r33676  
    598598    if (!Option)
    599599    {
    600         DEBUG((DEBUG_INFO, "%a:%d Option %s wasn't found \n", __FILE__, __LINE__, Option));
    601         continue;
     600        DEBUG((DEBUG_INFO, "%a:%d Option %s wasn't found \n", __FILE__, __LINE__, Option));
     601        continue;
    602602    }
    603603    Option->BootCurrent = OptionOrder[Index];

  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r33644 r33676  
    39863986    pHlp->pfnPrintf(pHlp, "start : %#x\n", val);
    39873987    if (!is_graph)
    3988     {   
     3988    {
    39893989        val = (s->cr[9] & 0x1f) + 1;
    39903990        char_height = val;
    … …  
    42134213        return;
    42144214    }
    4215    
     4215
    42164216    pHlp->pfnPrintf(pHlp, "VBE state (chip ID 0x%04x):\n", s->vbe_regs[VBE_DISPI_INDEX_ID]);
    42174217    pHlp->pfnPrintf(pHlp, " Display resolution: %d x %d @ %dbpp\n",
    … …  
    54405440    int         maxPage;
    54415441    int         bpl;
    5442    
     5442
    54435443
    54445444    /* For 4bpp modes, the planes are "stacked" on top of each other. */

  • trunk/src/VBox/Devices/Network/slirp/bootp.c

    r32747 r33676  
    247247
    248248    /*DHCP Offer specific*/
    249     /* 
     249    /*
    250250     * we're care in built-in tftp server about existence/validness of the boot file.
    251251     */

  • trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

    r33540 r33676  
    23422342        if (pThis->VBoxSCSI.fBusy)
    23432343        {
    2344            
     2344
    23452345            /* The BIOS had a request active when we got suspended. Resume it. */
    23462346            int rc = buslogicPrepareBIOSSCSIRequest(pThis);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

    r33386 r33676  
    115115    if (fOptions & UIMainMenuType_Debug)
    116116    {
    117         CMachine machine; /** @todo we should try get the machine here. But we'll 
     117        CMachine machine; /** @todo we should try get the machine here. But we'll
    118118                           *        probably be fine with the cached values. */
    119119        if (vboxGlobal().isDebuggerEnabled(machine))

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

    r33670 r33676  
    774774    m_Machine.SetVRAMSize (qMax (type.GetRecommendedVRAM(),
    775775                                (ULONG) (VBoxGlobal::requiredVideoMemory(&m_Machine) / _1M)));
    776    
     776
    777777    /* Selecting recommended chipset type */
    778778    m_Machine.SetChipsetType(type.GetRecommendedChipset());

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r33583 r33676  
    8989        $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
    9090ifdef VBOX_WITH_CRHGSMI
    91 VBoxOGLcrutil_DEFS.win.x86    += VBOX_WITH_CRHGSMI 
     91VBoxOGLcrutil_DEFS.win.x86    += VBOX_WITH_CRHGSMI
    9292VBoxOGLcrutil_LIBS.win.x86    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    9393endif
    … …  
    117117VBoxOGLhostcrutil_LIBS     = $(LIB_RUNTIME)
    118118ifdef VBOX_WITH_CRHGSMI
    119 VBoxOGLhostcrutil_DEFS.win.x86 = $(subst VBOX_WITH_CRHGSMI,,$(VBoxOGLcrutil_DEFS.win.x86)) 
     119VBoxOGLhostcrutil_DEFS.win.x86 = $(subst VBOX_WITH_CRHGSMI,,$(VBoxOGLcrutil_DEFS.win.x86))
    120120VBoxOGLhostcrutil_LIBS.win.x86 = $(subst $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB),,$(VBoxOGLcrutil_LIBS.win.x86))
    121121endif

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

    r33540 r33676  
    352352     * 100%, even if it involves some extra work (alloc + copy) we really wished
    353353     * to avoid.
    354      * 
    355      * Note. We can't make use of the physical addresses on darwin because the 
    356      *       way the mbuf / cluster stuff works (see mbuf_data_to_physical and 
     354     *
     355     * Note. We can't make use of the physical addresses on darwin because the
     356     *       way the mbuf / cluster stuff works (see mbuf_data_to_physical and
    357357     *       mcl_to_paddr).
    358358     */

  • trunk/src/VBox/Main/ConsoleVRDPServer.cpp

    r33590 r33676  
    12701270    int rc = VINF_SUCCESS;
    12711271
    1272     /* 
     1272    /*
    12731273     * Check that a VRDE library name is set.
    12741274     */

  • trunk/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp

    r32572 r33676  
    4141RT_EXPORT_SYMBOL(RTMpGetArraySize);
    4242
    43 

  • trunk/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp

    r33036 r33676  
    5252RT_EXPORT_SYMBOL(RTSemEventWait);
    5353
    54 

  • trunk/src/VBox/Runtime/include/internal/mem.h

    r33269 r33676  
    5757#endif
    5858
    59 

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

    r33269 r33676  
    341341}
    342342
    343 

  • trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp

    r33279 r33676  
    144144}
    145145
    146 

  • trunk/src/VBox/VMM/EMHwaccm.cpp

    r32956 r33676  
    560560            rc = VINF_SUCCESS;
    561561        }
    562        
     562
    563563
    564564        /*

  • trunk/src/VBox/VMM/PGMPool.cpp

    r33540 r33676  
    175175    cMaxPages = RT_ALIGN(cMaxPages, 16);
    176176
    177     /** todo: 
     177    /** todo:
    178178     * We need to be much more careful with our allocation strategy here.
    179179     * For nested paging we don't need pool user info nor extents at all, but we can't check for nested paging here (too early during init to get a confirmation it can be used)

  • trunk/src/VBox/VMM/VMM.cpp

    r33540 r33676  
    415415    STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3Rendezvous,      STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/Rendezvous",     STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");
    416416    STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3Timer,           STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/Timer",          STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");
    417     STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3DMA,             STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/DMA",            STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");   
    418     STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3CritSect,        STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/CritSect",       STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");       
     417    STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3DMA,             STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/DMA",            STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");
     418    STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3CritSect,        STAMTYPE_COUNTER, "/VMM/RZRet/ToR3/CritSect",       STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");
    419419    STAM_REG(pVM, &pVM->vmm.s.StatRZRetTimerPending,        STAMTYPE_COUNTER, "/VMM/RZRet/TimerPending",        STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TIMER_PENDING returns.");
    420420    STAM_REG(pVM, &pVM->vmm.s.StatRZRetInterruptPending,    STAMTYPE_COUNTER, "/VMM/RZRet/InterruptPending",    STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_INTERRUPT_PENDING returns.");

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r33540 r33676  
    14161416        AssertRelease(pPhysPage);
    14171417        pgmTrackDerefGCPhys(pPool, pShwPage, pPhysPage, iPte);
    1418         return;   
     1418        return;
    14191419    }
    14201420# endif
    … …  
    22352235                PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
    22362236                Log2(("SyncPage: 4K+ %RGv PteSrc:{P=1 RW=1 U=1} PteDst=%08llx%s\n",
    2237                       GCPtrCurPage, 
     2237                      GCPtrCurPage,
    22382238                      SHW_PTE_LOG64(pPTDst->a[iPTDst]),
    22392239                      SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
    … …  
    22552255
    22562256        Log2(("SyncPage: 4K  %RGv PteSrc:{P=1 RW=1 U=1}PteDst=%08llx%s\n",
    2257               GCPtrPage, 
     2257              GCPtrPage,
    22582258              SHW_PTE_LOG64(pPTDst->a[iPTDst]),
    22592259              SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
Note: See TracChangeset for help on using the changeset viewer.

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