VirtualBox

Changeset 2980 in vbox


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

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

Location:
trunk/src/VBox
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp

    r2265 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
    … …  
    8787unsigned __stdcall VBoxClipboardThread  (void *pInstance);
    8888void               VBoxClipboardDestroy (const VBOXSERVICEENV *pEnv, void *pInstance);
    89    
     89
    9090/* The service table. */
    91 static VBOXSERVICEINFO vboxServiceTable[] = 
     91static VBOXSERVICEINFO vboxServiceTable[] =
    9292{
    9393    {
    … …  
    105105{
    106106    pEnv->hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
    107    
     107
    108108    if (!pEnv->hStopEvent)
    109109    {
    … …  
    111111        return VERR_NOT_SUPPORTED;
    112112    }
    113    
     113
    114114    while (pTable->pszName)
    115115    {
    116116        SvcDebugOut2 ("Starting %s...\n", pTable->pszName);
    117        
     117
    118118        int rc = VINF_SUCCESS;
    119        
     119
    120120        bool fStartThread = false;
    121        
     121
    122122        pTable->hThread = (HANDLE)0;
    123123        pTable->pInstance = NULL;
    124124        pTable->fStarted = false;
    125    
     125
    126126        if (pTable->pfnInit)
    127127        {
    128128            rc = pTable->pfnInit (pEnv, &pTable->pInstance, &fStartThread);
    129129        }
    130            
     130
    131131        if (VBOX_FAILURE (rc))
    132132        {
    … …  
    138138            {
    139139                unsigned threadid;
    140                
     140
    141141                pTable->hThread = (HANDLE)_beginthreadex (NULL,  /* security */
    142142                                                          0,     /* stacksize */
    … …  
    145145                                                          0,     /* initflag */
    146146                                                          &threadid);
    147                
     147
    148148                if (pTable->hThread == (HANDLE)(0))
    149149                {
    … …  
    151151                }
    152152            }
    153            
     153
    154154            if (VBOX_FAILURE (rc))
    155155            {
    156156                SvcDebugOut2 ("Failed to start the thread.\n");
    157                
     157
    158158                if (pTable->pfnDestroy)
    159159                {
    … …  
    166166            }
    167167        }
    168        
     168
    169169        /* Advance to next table element. */
    170170        pTable++;
    171171    }
    172    
     172
    173173    return VINF_SUCCESS;
    174174}
    … …  
    180180        return;
    181181    }
    182    
     182
    183183    /* Signal to all threads. */
    184184    SetEvent(pEnv->hStopEvent);
    185    
     185
    186186    while (pTable->pszName)
    187187    {
    … …  
    192192                /* There is a thread, wait for termination. */
    193193                WaitForSingleObject(pTable->hThread, INFINITE);
    194                
     194
    195195                CloseHandle (pTable->hThread);
    196196                pTable->hThread = 0;
    197197            }
    198            
     198
    199199            if (pTable->pfnDestroy)
    200200            {
    201201                pTable->pfnDestroy (pEnv, pTable->pInstance);
    202202            }
    203            
     203
    204204            pTable->fStarted = false;
    205205        }
    206        
     206
    207207        /* Advance to next table element. */
    208208        pTable++;
    209209    }
    210    
     210
    211211    CloseHandle (pEnv->hStopEvent);
    212212}
    … …  
    216216{
    217217    SvcDebugOut2("VBoxService: Start\n");
    218    
     218
    219219    VBOXSERVICEENV svcEnv;
    220    
     220
    221221    DWORD status = NO_ERROR;
    222222
    … …  
    236236
    237237    SvcDebugOut2("VBoxService: Driver h %p, st %p\n", gVBoxDriver, status);
    238    
     238
    239239    if (status == NO_ERROR)
    240240    {
    … …  
    249249            status = GetLastError();
    250250    }
    251    
     251
    252252    SvcDebugOut2("VBoxService: Class st %p\n", status);
    253253
    … …  
    276276        }
    277277    }
    278    
     278
    279279    SvcDebugOut2("VBoxService: Window h %p, st %p\n", gToolWindow, status);
    280280
    … …  
    294294    svcEnv.hInstance  = gInstance;
    295295    svcEnv.hDriver    = gVBoxDriver;
    296        
     296
    297297    if (status == NO_ERROR)
    298298    {
    299299        int rc = vboxStartServices (&svcEnv, vboxServiceTable);
    300        
     300
    301301        if (VBOX_FAILURE (rc))
    302302        {
    … …  
    334334    ndata.uCallbackMessage = WM_USER;
    335335    ndata.hIcon            = LoadIcon(gInstance, MAKEINTRESOURCE(IDI_VIRTUALBOX));
    336     sprintf(ndata.szTip, "InnoTek VirtualBox Guest Additions %d.%d.%d", VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD);
     336    sprintf(ndata.szTip, "innotek VirtualBox Guest Additions %d.%d.%d", VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD);
    337337
    338338    SvcDebugOut2("VBoxService: ndata.hWnd %08X, ndata.hIcon = %p\n", ndata.hWnd, ndata.hIcon);
    339    
     339
    340340    /*
    341341     * Main execution loop
    … …  
    371371        {
    372372            SvcDebugOut2("VBoxService: timed out\n");
    373            
     373
    374374            /* we might have to repeat this operation because the shell might not be loaded yet */
    375375            if (!fTrayIconCreated)
    … …  
    392392
    393393    vboxStopServices (&svcEnv, vboxServiceTable);
    394    
     394
    395395    SvcDebugOut("VBoxService: destroying tool window...\n", 0);
    396396
    … …  
    504504
    505505            DDCLOG(("VBoxService: checking event\n"));
    506            
     506
    507507            /* did we get the right event? */
    508508            if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)

  • trunk/src/VBox/Additions/linux/module/vboxmod.c

    r2182 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3232
    3333MODULE_DESCRIPTION("VirtualBox Guest Additions for Linux Module");
    34 MODULE_AUTHOR("InnoTek Systemberatung GmbH");
     34MODULE_AUTHOR("innotek GmbH");
    3535MODULE_LICENSE("GPL");
    3636#ifdef MODULE_VERSION

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

    r2614 r2980  
    1111
    1212/*
    13  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     13 * Copyright (C) 2006-2007 innotek GmbH
    1414 *
    1515 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4545
    4646MODULE_DESCRIPTION ("Host file system access VFS for VirtualBox");
    47 MODULE_AUTHOR ("InnoTek Systemberatung GmbH");
     47MODULE_AUTHOR ("innotek GmbH");
    4848MODULE_LICENSE ("GPL");
    4949#ifdef MODULE_VERSION

  • trunk/src/VBox/Additions/linux/xgraphics/vboxvideo.c

    r1785 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    234234{
    235235    VBOX_DRIVER_NAME,
    236     "InnoTek Systemberatung GmbH",
     236    "innotek Systemberatung GmbH",
    237237    MODINFOSTRING1,
    238238    MODINFOSTRING2,
    … …  
    539539        /* Add 1024x768 to the end of the mode list in case the others are all invalid. */
    540540        for (i = 0; pScrn->display->modes[i] != NULL; i++);
    541         pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 2) 
     541        pScrn->display->modes      = xnfrealloc(pScrn->display->modes, (i + 2)
    542542                                   * sizeof(char *));
    543543        pScrn->display->modes[i  ] = "1024x768";

  • trunk/src/VBox/Additions/linux/xmouse/mouse.c

    r1260 r2980  
    24142414#ifdef VBOX
    24152415    "vboxmouse",
    2416     "InnoTek Systemberatung GmbH",
     2416    "innotek GmbH",
    24172417#else
    24182418    "mouse",

  • trunk/src/VBox/Additions/linux/xmouse/xorg70/mouse.c

    r1260 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
    … …  
    38403840#ifdef VBOX
    38413841    "vboxmouse",
    3842     "InnoTek Systemberatung GmbH",
     3842    "innotek GmbH",
    38433843#else
    38443844    "mouse",

  • trunk/src/VBox/Additions/linux/xmouse/xorg71/mouse.c

    r1260 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
    … …  
    38463846#ifdef VBOX
    38473847    "vboxmouse",
    3848     "InnoTek Systemberatung GmbH",
     3848    "innotek GmbH",
    38493849#else
    38503850    "mouse",

  • trunk/src/VBox/Devices/Audio/audio.c

    r1551 r2980  
    201201            shown = 1;
    202202            AUD_log (NULL, "Save all your work and restart without audio\n");
    203             AUD_log (NULL, "Please send a bug report to InnoTek\n");
     203            AUD_log (NULL, "Please send a bug report to innotek\n");
    204204            AUD_log (NULL, "I am sorry\n");
    205205        }

  • trunk/src/VBox/Devices/Graphics/BIOS/vbe.c

    r1397 r2980  
    7272
    7373_vbebios_vendor_name:
    74 .ascii       "InnoTek Systemberatung GmbH"
     74.ascii       "innotek GmbH"
    7575.byte        0x00
    7676
    … …  
    8080
    8181_vbebios_product_revision:
    82 .ascii       "InnoTek VirtualBox Version "
     82.ascii       "innotek VirtualBox Version "
    8383.ascii       VBOX_VERSION_STRING
    8484.byte        0x00
    … …  
    8686_vbebios_info_string:
    8787//.ascii      "Bochs VBE Display Adapter enabled"
    88 .ascii       "InnoTek VirtualBox VBE Display Adapter enabled"
     88.ascii       "innotek VirtualBox VBE Display Adapter enabled"
    8989.byte   0x0a,0x0d
    9090.byte   0x0a,0x0d
    … …  
    9898
    9999msg_vbe_init:
    100 .ascii       "InnoTek VirtualBox Version "
     100.ascii       "innotek VirtualBox Version "
    101101.ascii       VBOX_VERSION_STRING
    102102.ascii       " VBE Display Adapter"

  • trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c

    r1397 r2980  
    44 */
    55// ============================================================================================
    6 // 
     6//
    77//  Copyright (C) 2001,2002 the LGPL VGABios developers Team
    88//
    … …  
    2020//  License along with this library; if not, write to the Free Software
    2121//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    22 // 
     22//
    2323// ============================================================================================
    24 // 
    25 //  This VGA Bios is specific to the plex86/bochs Emulated VGA card. 
    26 //  You can NOT drive any physical vga card with it. 
    27 //     
     24//
     25//  This VGA Bios is specific to the plex86/bochs Emulated VGA card.
     26//  You can NOT drive any physical vga card with it.
     27//
    2828// ============================================================================================
    29 // 
     29//
    3030//  This file contains code ripped from :
    31 //   - rombios.c of plex86 
     31//   - rombios.c of plex86
    3232//
    3333//  This VGA Bios contains fonts from :
    3434//   - fntcol16.zip (c) by Joseph Gil avalable at :
    3535//      ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip
    36 //     These fonts are public domain 
     36//     These fonts are public domain
    3737//
    3838//  This VGA Bios is based on information taken from :
    … …  
    143143
    144144vgabios_entry_point:
    145            
     145
    146146  jmp vgabios_init_func
    147147
    … …  
    201201.byte   0x00
    202202#endif
    203  
     203
    204204
    205205;; ============================================================================================
    … …  
    216216  call init_bios_area
    217217
    218 #ifdef VBE 
     218#ifdef VBE
    219219;; init vbe functions
    220   call vbe_init 
     220  call vbe_init
    221221#endif
    222222
    … …  
    241241  call _display_info
    242242
    243 #ifdef VBE 
     243#ifdef VBE
    244244;; show vbe info
    245   call vbe_display_info 
     245  call vbe_display_info
    246246#endif
    247247
    … …  
    257257  mov ax,#0x0003
    258258  int #0x10
    259 #endif 
     259#endif
    260260#endif /* VBOX */
    261261
    … …  
    394394
    395395/*
    396  * Boot time harware inits 
     396 * Boot time harware inits
    397397 */
    398398ASM_START
    … …  
    419419
    420420msg_vga_init:
    421 .ascii "InnoTek VirtualBox Version "
     421.ascii "innotek VirtualBox Version "
    422422.ascii VBOX_VERSION_STRING
    423423.ascii " VGA BIOS"
    … …  
    427427// --------------------------------------------------------------------------------------------
    428428/*
    429  *  Boot time bios area inits 
     429 *  Boot time bios area inits
    430430 */
    431431ASM_START
    … …  
    450450  mov   [bx], al
    451451
    452 ;; Clear the screen 
     452;; Clear the screen
    453453  mov   bx, # BIOSMEM_VIDEO_CTL
    454454  mov   al, #0x60
    … …  
    498498 mov si,#vgabios_version
    499499 call _display_string
    500  
     500
    501501 ;;mov si,#vgabios_copyright
    502502 ;;call _display_string
    … …  
    523523 xor al,al
    524524 cld
    525  repne 
     525 repne
    526526  scasb
    527527 not cx
    … …  
    532532 mov bx,#0x0000
    533533 int #0x10
    534  
     534
    535535 pop cx
    536536 mov ax,#0x1301
    … …  
    566566     biosfn_set_video_mode(GET_AL());
    567567     switch(GET_AL()&0x7F)
    568       {case 6: 
     568      {case 6:
    569569        SET_AL(0x3F);
    570570        break;
    … …  
    676676#endif
    677677      }
    678      
     678
    679679     break;
    680680   case 0x12:
    … …  
    725725     break;
    726726
    727 #ifdef VBE 
     727#ifdef VBE
    728728   case 0x4f:
    729729     if (vbe_has_vbe_display()) {
    … …  
    766766#ifdef DEBUG
    767767          unknown();
    768 #endif                   
     768#endif
    769769          // function failed
    770770          AX=0x100;
    … …  
    786786
    787787// ============================================================================================
    788 // 
     788//
    789789// BIOS functions
    790 // 
     790//
    791791// ============================================================================================
    792792
    793 static void biosfn_set_video_mode(mode) Bit8u mode; 
     793static void biosfn_set_video_mode(mode) Bit8u mode;
    794794{// mode: Bit 7 is 1 if no clear screen
    795795
    … …  
    800800 Bit8u modeset_ctl,video_ctl,vga_switches;
    801801 Bit16u crtc_addr;
    802  
     802
    803803#ifdef VBE
    804  if (vbe_has_vbe_display()) { 
     804 if (vbe_has_vbe_display()) {
    805805   dispi_set_enable(VBE_DISPI_DISABLED);
    806806  }
    807807#endif // def VBE
    808  
     808
    809809 // The real mode
    810810 mode=mode&0x7f;
    … …  
    823823 theight=vga_modes[line].theight;
    824824 cheight=vga_modes[line].cheight;
    825  
     825
    826826 // Read the bios vga control
    827827 video_ctl=read_byte(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL);
    … …  
    899899  }
    900900
    901  // Set CRTC address VGA or MDA 
     901 // Set CRTC address VGA or MDA
    902902 crtc_addr=vga_modes[line].memmodel==MTEXT?VGAREG_MDA_CRTC_ADDRESS:VGAREG_VGA_CRTC_ADDRESS;
    903903
    … …  
    959959 write_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_MSR,0x00); // Unavailable on vanilla vga, but...
    960960 write_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_PAL,0x00); // Unavailable on vanilla vga, but...
    961  
     961
    962962 // Set cursor shape
    963963 if(vga_modes[line].class==TEXT)
    … …  
    975975 // Write the fonts in memory
    976976 if(vga_modes[line].class==TEXT)
    977   { 
     977  {
    978978ASM_START
    979979  ;; copy and activate 8x16 font
    … …  
    10121012
    10131013// --------------------------------------------------------------------------------------------
    1014 static void biosfn_set_cursor_shape (CH,CL) 
    1015 Bit8u CH;Bit8u CL; 
     1014static void biosfn_set_cursor_shape (CH,CL)
     1015Bit8u CH;Bit8u CL;
    10161016{Bit16u cheight,curs,crtc_addr;
    10171017 Bit8u modeset_ctl;
    … …  
    10471047
    10481048// --------------------------------------------------------------------------------------------
    1049 static void biosfn_set_cursor_pos (page, cursor) 
     1049static void biosfn_set_cursor_pos (page, cursor)
    10501050Bit8u page;Bit16u cursor;
    10511051{
    … …  
    10681068
    10691069   xcurs=cursor&0x00ff;ycurs=(cursor&0xff00)>>8;
    1070  
     1070
    10711071   // Calculate the address knowing nbcols nbrows and page num
    10721072   address=SCREEN_IO_START(nbcols,nbrows,page)+xcurs+ycurs*nbcols;
    1073    
     1073
    10741074   // CRTC regs 0x0e and 0x0f
    10751075   crtc_addr=read_word(BIOSMEM_SEG,BIOSMEM_CRTC_ADDRESS);
    … …  
    10821082
    10831083// --------------------------------------------------------------------------------------------
    1084 static void biosfn_get_cursor_pos (page,shape, pos) 
     1084static void biosfn_get_cursor_pos (page,shape, pos)
    10851085Bit8u page;Bit16u *shape;Bit16u *pos;
    10861086{
    … …  
    10981098
    10991099// --------------------------------------------------------------------------------------------
    1100 static void biosfn_set_active_page (page) 
     1100static void biosfn_set_active_page (page)
    11011101Bit8u page;
    11021102{
    … …  
    11121112 if(line==0xFF)return;
    11131113
    1114  // Get pos curs pos for the right page 
     1114 // Get pos curs pos for the right page
    11151115 biosfn_get_cursor_pos(page,&dummy,&cursor);
    11161116
    … …  
    11201120   nbcols=read_word(BIOSMEM_SEG,BIOSMEM_NB_COLS);
    11211121   nbrows=read_byte(BIOSMEM_SEG,BIOSMEM_NB_ROWS)+1;
    1122  
     1122
    11231123   // Calculate the address knowing nbcols nbrows and page num
    11241124   address=SCREEN_MEM_START(nbcols,nbrows,page);
    … …  
    13651365
    13661366// --------------------------------------------------------------------------------------------
    1367 static void biosfn_read_char_attr (page,car) 
     1367static void biosfn_read_char_attr (page,car)
    13681368Bit8u page;Bit16u *car;
    13691369{Bit16u ss=get_SS();
    … …  
    15661566
    15671567// --------------------------------------------------------------------------------------------
    1568 static void biosfn_write_char_attr (car,page,attr,count) 
     1568static void biosfn_write_char_attr (car,page,attr,count)
    15691569Bit8u car;Bit8u page;Bit8u attr;Bit16u count;
    15701570{
    … …  
    18971897
    18981898// --------------------------------------------------------------------------------------------
    1899 static void biosfn_write_teletype (car, page, attr, flag) 
     1899static void biosfn_write_teletype (car, page, attr, flag)
    19001900Bit8u car;Bit8u page;Bit8u attr;Bit8u flag;
    19011901{// flag = WITH_ATTR / NO_ATTR
    … …  
    19531953    if(vga_modes[line].class==TEXT)
    19541954     {
    1955       // Compute the address 
     1955      // Compute the address
    19561956      address=SCREEN_MEM_START(nbcols,nbrows,page)+(xcurs+ycurs*nbcols)*2;
    19571957
    1958       // Write the char 
     1958      // Write the char
    19591959      write_byte(vga_modes[line].sstart,address,car);
    19601960
    … …  
    20072007   ycurs-=1;
    20082008  }
    2009  
     2009
    20102010 // Set the cursor for the page
    20112011 cursor=ycurs; cursor<<=8; cursor+=xcurs;
    … …  
    25092509
    25102510// --------------------------------------------------------------------------------------------
    2511 static void biosfn_perform_gray_scale_summing (start,count) 
     2511static void biosfn_perform_gray_scale_summing (start,count)
    25122512Bit16u start;Bit16u count;
    25132513{Bit8u r,g,b;
    … …  
    25182518 outb(VGAREG_ACTL_ADDRESS,0x00);
    25192519
    2520  for( index = 0; index < count; index++ ) 
     2520 for( index = 0; index < count; index++ )
    25212521  {
    25222522   // set read address and switch to read mode
    … …  
    25312531
    25322532   if(i>0x3f)i=0x3f;
    2533  
     2533
    25342534   // set write address and switch to write mode
    25352535   outb(VGAREG_DAC_WRITE_ADDRESS,start);
    … …  
    25392539   outb( VGAREG_DAC_DATA, i&0xff );
    25402540   start++;
    2541   } 
     2541  }
    25422542 inb(VGAREG_ACTL_RESET);
    25432543 outb(VGAREG_ACTL_ADDRESS,0x20);
    … …  
    27542754}
    27552755// --------------------------------------------------------------------------------------------
    2756 static void biosfn_get_font_info (BH,ES,BP,CX,DX) 
     2756static void biosfn_get_font_info (BH,ES,BP,CX,DX)
    27572757Bit8u BH;Bit16u *ES;Bit16u *BP;Bit16u *CX;Bit16u *DX;
    27582758{Bit16u ss=get_SS();
    2759  
     2759
    27602760 switch(BH)
    27612761  {case 0x00:
    … …  
    30113011
    30123012// --------------------------------------------------------------------------------------------
    3013 static void biosfn_write_string (flag,page,attr,count,row,col,seg,offset) 
     3013static void biosfn_write_string (flag,page,attr,count,row,col,seg,offset)
    30143014Bit8u flag;Bit8u page;Bit8u attr;Bit16u count;Bit8u row;Bit8u col;Bit16u seg;Bit16u offset;
    30153015{
    … …  
    30283028 newcurs=row; newcurs<<=8; newcurs+=col;
    30293029 biosfn_set_cursor_pos(page,newcurs);
    3030  
     3030
    30313031 while(count--!=0)
    30323032  {
    … …  
    30373037   biosfn_write_teletype(car,page,attr,WITH_ATTR);
    30383038  }
    3039  
    3040  // Set back curs pos 
     3039
     3040 // Set back curs pos
    30413041 if((flag&0x01)==0)
    30423042  biosfn_set_cursor_pos(page,oldcurs);
    … …  
    30993099
    31003100// --------------------------------------------------------------------------------------------
    3101 static void biosfn_read_state_info (BX,ES,DI) 
     3101static void biosfn_read_state_info (BX,ES,DI)
    31023102Bit16u BX;Bit16u ES;Bit16u DI;
    31033103{
    … …  
    31093109 memcpyb(ES,DI+0x04,BIOSMEM_SEG,0x49,30);
    31103110 memcpyb(ES,DI+0x22,BIOSMEM_SEG,0x84,3);
    3111  
     3111
    31123112 write_byte(ES,DI+0x25,read_byte(BIOSMEM_SEG,BIOSMEM_DCC_INDEX));
    31133113 write_byte(ES,DI+0x26,0);
    … …  
    31203120 write_byte(ES,DI+0x31,3);
    31213121 write_byte(ES,DI+0x32,0);
    3122  
     3122
    31233123 memsetb(ES,DI+0x33,0,13);
    31243124}
    … …  
    31493149//
    31503150// ============================================================================================
    3151  
    3152 // --------------------------------------------------------------------------------------------
    3153 static Bit8u find_vga_entry(mode) 
     3151
     3152// --------------------------------------------------------------------------------------------
     3153static Bit8u find_vga_entry(mode)
    31543154Bit8u mode;
    31553155{
    … …  
    36063606// --------------------------------------------------------------------------------------------
    36073607
    3608 ASM_START 
     3608ASM_START
    36093609;; DATA_SEG_DEFS_HERE
    36103610ASM_END

  • trunk/src/VBox/Devices/PC/DevPcBios.cpp

    r2781 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    750750    pBIOSInf->header.u16Handle   = 0x0000;
    751751    pBIOSInf->u8Vendor           = iStrNr++;
    752     STRCPY(pszStr, "InnoTek Systemberatung GmbH");
     752    STRCPY(pszStr, "innotek GmbH");
    753753    pBIOSInf->u8Version          = iStrNr++;
    754754    STRCPY(pszStr, "VirtualBox");
    … …  
    781781    pSystemInf->header.u16Handle = 0x0001;
    782782    pSystemInf->u8Manufacturer   = iStrNr++;
    783     STRCPY(pszStr, "InnoTek Systemberatung GmbH");
     783    STRCPY(pszStr, "innotek GmbH");
    784784    pSystemInf->u8ProductName    = iStrNr++;
    785785    STRCPY(pszStr, "VirtualBox");

  • trunk/src/VBox/Devices/Storage/testcase/vditool.cpp

    r2580 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    281281
    282282    RTR3Init();
    283     RTPrintf("vditool    Copyright (c) 2004-2005 InnoTek Systemberatung GmbH.\n\n");
     283    RTPrintf("vditool    Copyright (c) 2004-2005 innotek GmbH.\n\n");
    284284
    285285    /*

  • trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp

    r2491 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    12191219    char title[1024];
    12201220
    1221     strcpy(title, "InnoTek VirtualBox");
     1221    strcpy(title, "innotek VirtualBox");
    12221222
    12231223    if (machineState == VMSTATE_SUSPENDED)
    … …  
    12511251#endif /* DEBUG */
    12521252
    1253     SDL_WM_SetCaption(title, "InnoTek VirtualBox");
     1253    SDL_WM_SetCaption(title, "innotek VirtualBox");
    12541254}
    12551255
    … …  
    12621262    char szTitle[256];
    12631263    AssertMsg(iPercent >= 0 && iPercent <= 100, ("%d\n", iPercent));
    1264     RTStrPrintf(szTitle, sizeof(szTitle), "InnoTek VirtualBox - Saving %d%%...", iPercent);
    1265     SDL_WM_SetCaption(szTitle, "InnoTek VirtualBox");
     1264    RTStrPrintf(szTitle, sizeof(szTitle), "innotek VirtualBox - Saving %d%%...", iPercent);
     1265    SDL_WM_SetCaption(szTitle, "innotek VirtualBox");
    12661266}
    12671267

  • trunk/src/VBox/Frontends/VBoxFB/VBoxFB.cpp

    r1 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6363
    6464    printf("VirtualBox DirectFB GUI built %s %s\n"
    65            "(C) 2004-2005 InnoTek Systemberatung GmbH\n"
     65           "(C) 2004-2007 innotek GmbH\n"
    6666           "(C) 2004-2005 secunet Security Networks AG\n", __DATE__, __TIME__);
    6767

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r2976 r2980  
    88
    99/*
    10  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     10 * Copyright (C) 2006-2007 innotek GmbH
    1111 *
    1212 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    61066106
    61076107    RTPrintf("VirtualBox Command Line Management Interface Version %s\n"
    6108              "(C) 2005-2007 InnoTek Systemberatung GmbH\n"
     6108             "(C) 2005-2007 innotek GmbH\n"
    61096109             "All rights reserved.\n"
    61106110             "\n",

  • trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

    r2729 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    14001400    }
    14011401
    1402     /* 
     1402    /*
    14031403     * Mount a floppy if requested.
    14041404     */
    … …  
    14621462        goto leave;
    14631463
    1464     /* 
     1464    /*
    14651465     * Mount a CD-ROM if requested.
    14661466     */
    … …  
    36363636
    36373637
    3638     strcpy(szTitle, "InnoTek VirtualBox - ");
     3638    strcpy(szTitle, "innotek VirtualBox - ");
    36393639
    36403640    Bstr name;
    … …  
    37573757    setUITitle(szTitle);
    37583758#else
    3759     SDL_WM_SetCaption(szTitle, "InnoTek VirtualBox");
     3759    SDL_WM_SetCaption(szTitle, "innotek VirtualBox");
    37603760#endif
    37613761}

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

    r2957 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    13261326    caption_prefix = tr ("VirtualBox OSE");
    13271327#else
    1328     caption_prefix = tr ("InnoTek VirtualBox");
     1328    caption_prefix = tr ("innotek VirtualBox");
    13291329#endif
    13301330

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

    r2957 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    17401740/**
    17411741 *  Comma-separated list of authors of the currently installed translation.
    1742  *  Returns "InnoTek" if no translation is installed or if the translation
    1743  *  file is invalid, or if the translation is supplied by InnoTek.
     1742 *  Returns "innotek" if no translation is installed or if the translation
     1743 *  file is invalid, or if the translation is supplied by innotek.
    17441744 */
    17451745QString VBoxGlobal::languageTranslators() const
    17461746{
    1747     return qApp->translate ("@@@", "InnoTek",
     1747    return qApp->translate ("@@@", "innotek",
    17481748                            "Comma-separated list of translators");
    17491749}
    … …  
    20502050        if (qtSysTr && qtSysTr->load (languageFileName))
    20512051            qApp->installTranslator (qtSysTr);
    2052         /* Note that the Qt translation supplied by InnoTek is always loaded
     2052        /* Note that the Qt translation supplied by innotek is always loaded
    20532053         * afterwards to make sure it will take precedence over the system
    20542054         * translation (it may contain more decent variants of translation
    20552055         * that better correspond to VirtualBox UI). We need to load both
    20562056         * because a newer version of Qt may be installed on the user computer
    2057          * and the InnoTek version may not fully support it. We don't do it on
     2057         * and the innotek version may not fully support it. We don't do it on
    20582058         * Win32 because we supply a Qt library there and therefore the
    2059          * InnoTek translation is always the best one. */
     2059         * innotek translation is always the best one. */
    20602060#endif
    20612061        languageFileName =  nlsDir.absFilePath (QString ("qt_") +
    … …  
    28642864    ev.xclient.data.l [3] = aData3;
    28652865    ev.xclient.data.l [4] = aData4;
    2866    
     2866
    28672867    return XSendEvent (aDpy, DefaultRootWindow (aDpy), False,
    28682868                       SubstructureRedirectMask, &ev) != 0;
    … …  
    28712871#endif
    28722872
    2873 /** 
     2873/**
    28742874 * Activates the specified window. If necessary, the window will be
    28752875 * de-iconified activation.
    … …  
    28772877 * @note On X11, it is implied that @a aWid represents a window of the same
    28782878 * display the application was started on.
    2879  * 
    2880  * @param aWId              Window ID to activate.       
     2879 *
     2880 * @param aWId              Window ID to activate.
    28812881 * @param aSwitchDesktop    @c true to switch to the window's desktop before
    28822882 *                          activation.
    2883  * 
     2883 *
    28842884 * @return @c true on success and @c false otherwise.
    28852885 */
    … …  
    29152915        if (desktop != NULL)
    29162916        {
    2917             Bool ok = XXSendClientMessage (dpy, DefaultRootWindow (dpy), 
     2917            Bool ok = XXSendClientMessage (dpy, DefaultRootWindow (dpy),
    29182918                                           "_NET_CURRENT_DESKTOP",
    29192919                                           *desktop);

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

    r2979 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    10281028    setCaption (tr ("VirtualBox OSE"));
    10291029#else
    1030     setCaption (tr ("InnoTek VirtualBox"));
     1030    setCaption (tr ("innotek VirtualBox"));
    10311031#endif
    10321032

  • trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui.h

    r2936 r2980  
    66
    77/*
    8  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     8 * Copyright (C) 2006-2007 innotek GmbH
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    112112
    113113        QString translatorsName = tratra (aTranslator,
    114             "@@@", "InnoTek", "Comma-separated list of translators");
     114            "@@@", "innotek", "Comma-separated list of translators");
    115115
    116116        QString itemName = nativeLanguage;

  • 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");

  • trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp

    r1197 r2980  
    121121                           "VirtualBox.org Support Driver for OS/2 version " VBOX_VERSION_STRING "\r\n"
    122122                           "Copyright (C) 2007 Knut St. Osmundsen\r\n"
    123                            "Copyright (C) 2007 InnoTek Systemberatung GmbH\r\n");
     123                           "Copyright (C) 2007 innotek GmbH\r\n");
    124124                    g_cchInitText = strlen(&g_szInitText[0]);
    125125                }

  • trunk/src/VBox/HostDrivers/VBoxTAP/VBoxTAP.inf

    r2690 r2980  
    33;
    44;
    5 ; Copyright (C) 2006 InnoTek Systemberatung GmbH
     5; Copyright (C) 2006-2007 innotek GmbH
    66;
    77; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3232; Note; there are hardcoded checks for these strings!!
    3333   DeviceDescription = "VirtualBox TAP Adapter"
    34    Provider = "InnoTek Systemberatung GmbH"
     34   Provider = "innotek GmbH"
    3535
    3636;----------------------------------------------------------------

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

    r2961 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    8888{
    8989    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED
    90     "<!-- InnoTek VirtualBox Machine Configuration -->" RTFILE_LINEFEED
     90    "<!-- innotek VirtualBox Machine Configuration -->" RTFILE_LINEFEED
    9191    "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
    9292        "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED
    … …  
    30273027}
    30283028
    3029 /** 
     3029/**
    30303030 *  Increases the number of objects dependent on the machine state or on the
    30313031 *  registered state.  Guarantees that these two states will not change at
    … …  
    30343034 *  Depending on the @a aDepType value, additional state checks may be
    30353035 *  made. These checks will set extended error info on failure.
    3036  * 
     3036 *
    30373037 *  If this method returns a failure, the dependency is not added and the
    30383038 *  caller is not allowed to rely on any particular machine state or
    … …  
    32123212
    32133213
    3214 /** 
     3214/**
    32153215 *  Chhecks that there are no state dependants. If necessary, waits for the
    32163216 *  number of dependants to drop to zero. Must be called from under
    … …  
    35543554            mSSData->mStateFilePath.setNull();
    35553555
    3556             /* no need to use setMachineState() during init() */ 
     3556            /* no need to use setMachineState() during init() */
    35573557            mData->mMachineState = MachineState_Aborted;
    35583558        }
    35593559        else if (mSSData->mStateFilePath)
    35603560        {
    3561             /* no need to use setMachineState() during init() */ 
     3561            /* no need to use setMachineState() during init() */
    35623562            mData->mMachineState = MachineState_Saved;
    35633563        }

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

    r2976 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    7373{
    7474    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED
    75     "<!-- InnoTek VirtualBox Global Configuration -->" RTFILE_LINEFEED
     75    "<!-- innotek VirtualBox Global Configuration -->" RTFILE_LINEFEED
    7676    "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
    7777        "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED
    … …  
    30493049                /* locations of VDI and VMDK hard disks for now are just
    30503050                 * file paths */
    3051                 found = RTPathCompare (location, 
     3051                found = RTPathCompare (location,
    30523052                                       Utf8Str (hd->toString
    30533053                                                (false /* aShort */))) == 0;

  • trunk/src/VBox/Main/linux/server.cpp

    r2976 r2980  
    55
    66/*
    7  * Copyright (C) 2006 InnoTek Systemberatung GmbH
     7 * Copyright (C) 2006-2007 innotek GmbH
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    345345                     *
    346346                     * In either case, there is nothing to do.
    347                      * 
     347                     *
    348348                     * Note: case b) is actually no more valid since we don't
    349349                     * call Release() from DestructEventHandler() in this case
    … …  
    525525                LogFlowFunc (("Another client has requested a reference to VirtualBox, "
    526526                              "canceling detruction...\n"));
    527                
     527
    528528                /* make sure the previous timer is stopped */
    529529                RTTimerStop (sTimer);
    … …  
    11401140
    11411141            iSize = snprintf (szBuf, sizeof(szBuf),
    1142                               "InnoTek VirtualBox XPCOM Server Version %s",
     1142                              "innotek VirtualBox XPCOM Server Version %s",
    11431143                              VBOX_VERSION_STRING);
    11441144            for (int i=iSize; i>0; i--)
    11451145                putchar('*');
    11461146            printf ("\n%s\n", szBuf);
    1147             printf ("(C) 2004-2007 InnoTek Systemberatung GmbH\n");
     1147            printf ("(C) 2004-2007 innotek GmbH\n");
    11481148            printf ("All rights reserved.\n");
    11491149#ifdef DEBUG
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