VirtualBox

Ignore:
Timestamp:
Jun 1, 2007 3:56:12 PM (18 years ago)
Author:
vboxsync
Message:

InnoTek -> innotek: actual code changes (headers follow).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

    r2898 r2980  
    44
    55/*
    6  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     6 * Copyright (C) 2006-2007 innotek GmbH
    77 *
    88 * This file is part of VirtualBox Open Source Edition (OSE), as
     
    12741274#ifdef CONFIG_SMP
    12751275    unsigned i;
    1276 #endif 
     1276#endif
    12771277    dprintf(("VBoxSupDrvInitGip:\n"));
    12781278
     
    13191319    g_GipTimer.expires = jiffies;
    13201320#ifdef CONFIG_SMP
    1321     for (i = 0; i < RT_ELEMENTS(pDevExt->aCPUs); i++) 
     1321    for (i = 0; i < RT_ELEMENTS(pDevExt->aCPUs); i++)
    13221322    {
    13231323        pDevExt->aCPUs[i].u64LastMonotime = pDevExt->u64LastMonotime;
     
    13291329        pDevExt->aCPUs[i].Timer.expires   = jiffies;
    13301330    }
    1331 #endif 
     1331#endif
    13321332
    13331333    return 0;
     
    13471347#ifdef CONFIG_SMP
    13481348    unsigned i;
    1349 #endif 
     1349#endif
    13501350    dprintf(("VBoxSupDrvTermGip:\n"));
    13511351
     
    13591359        if (timer_pending(&pDevExt->aCPUs[i].Timer))
    13601360            del_timer_sync(&pDevExt->aCPUs[i].Timer);
    1361 #endif 
     1361#endif
    13621362
    13631363    /*
     
    13851385/**
    13861386 * Timer callback function.
    1387  * 
    1388  * In ASYNC TSC mode this is called on the primary CPU, and we're 
     1387 *
     1388 * In ASYNC TSC mode this is called on the primary CPU, and we're
    13891389 * assuming that the CPU remains online.
    1390  * 
     1390 *
    13911391 * @param   ulUser  The device extension pointer.
    13921392 */
     
    14071407
    14081408#ifdef CONFIG_SMP
    1409     if (pGip && pGip->u32Mode == SUPGIPMODE_ASYNC_TSC) 
     1409    if (pGip && pGip->u32Mode == SUPGIPMODE_ASYNC_TSC)
    14101410    {
    14111411        uint8_t iCPU = ASMGetApicId();
     
    14431443/**
    14441444 * Timer callback function for the other CPUs.
    1445  * 
     1445 *
    14461446 * @param   iTimerCPU     The APIC ID of this timer.
    14471447 */
     
    14591459    pGip    = pDevExt->pGip;
    14601460    iCPU    = ASMGetApicId();
    1461    
     1461
    14621462    if (RT_LIKELY(iCPU < RT_ELEMENTS(pGip->aCPUs)))
    14631463    {
    1464         if (RT_LIKELY(iTimerCPU == iCPU)) 
     1464        if (RT_LIKELY(iTimerCPU == iCPU))
    14651465        {
    14661466            unsigned long   ulNow  = jiffies;
     
    14831483    }
    14841484    else
    1485         printk("vboxdrv: error: APIC ID is bogus (GIP CPU update): apicid=%d max=%d cpuid=%d\n", 
     1485        printk("vboxdrv: error: APIC ID is bogus (GIP CPU update): apicid=%d max=%d cpuid=%d\n",
    14861486               iCPU, RT_ELEMENTS(pGip->aCPUs), smp_processor_id());
    14871487
     
    15981598    ASMAtomicXchgU8(&pDevExt->fGIPSuspended, false);
    15991599#ifdef CONFIG_SMP
    1600     if (pDevExt->pGip->u32Mode != SUPGIPMODE_ASYNC_TSC) 
     1600    if (pDevExt->pGip->u32Mode != SUPGIPMODE_ASYNC_TSC)
    16011601#endif
    16021602        mod_timer(&g_GipTimer, jiffies);
     
    16071607        smp_call_function(VBoxSupGipResumePerCpu, pDevExt, 0 /* retry */, 1 /* wait */);
    16081608    }
    1609 #endif 
     1609#endif
    16101610}
    16111611
     
    16141614/**
    16151615 * Callback for resuming GIP updating on the other CPUs.
    1616  * 
     1616 *
    16171617 * This is only used when the GIP is in async tsc mode.
    1618  * 
     1618 *
    16191619 * @param   pvUser  Pointer to the device instance.
    16201620 */
     
    16261626    if (RT_UNLIKELY(iCPU >= RT_ELEMENTS(pDevExt->pGip->aCPUs)))
    16271627    {
    1628         printk("vboxdrv: error: apicid=%d max=%d cpuid=%d\n", 
     1628        printk("vboxdrv: error: apicid=%d max=%d cpuid=%d\n",
    16291629               iCPU, RT_ELEMENTS(pDevExt->pGip->aCPUs), smp_processor_id());
    16301630        return;
     
    16461646#ifdef CONFIG_SMP
    16471647    unsigned i;
    1648 #endif 
     1648#endif
    16491649    dprintf2(("supdrvOSGipSuspend:\n"));
    16501650    ASMAtomicXchgU8(&pDevExt->fGIPSuspended, true);
     
    16561656        if (timer_pending(&pDevExt->aCPUs[i].Timer))
    16571657            del_timer_sync(&pDevExt->aCPUs[i].Timer);
    1658 #endif 
     1658#endif
    16591659}
    16601660
     
    16741674#else
    16751675    return 1;
    1676 #endif 
     1676#endif
    16771677}
    16781678
     
    17671767module_exit(VBoxSupDrvUnload);
    17681768
    1769 MODULE_AUTHOR("InnoTek Systemberatung GmbH");
     1769MODULE_AUTHOR("innotek GmbH");
    17701770MODULE_DESCRIPTION("VirtualBox Support Driver");
    17711771MODULE_LICENSE("GPL");
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