← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Graphics/BIOS/vbe.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Graphics/BIOS/vbe.c
408
408
#else
409
409
  in   ax, dx
410
410
#endif
 
411
  cmp  al, #4
 
412
  jbe  get_bpp_noinc
411
413
  mov  ah, al
412
414
  shr  ah, 3
413
415
  test al, #0x07
1484
1486
                dispi_set_enable(VBE_DISPI_DISABLED);
1485
1487
 
1486
1488
#ifdef VBE_NEW_DYN_LIST
1487
 
                data = in_word(VBE_EXTRA_PORT, &cur_info->mode);
1488
 
                if (data == VBE_VESA_MODE_800X600X4)
 
1489
                if (bpp == 4)
1489
1490
#else
1490
 
                if (cur_info->mode == VBE_VESA_MODE_800X600X4)
 
1491
                if (cur_info->info.BitsPerPixel == 4)
1491
1492
#endif
1492
1493
                {
1493
1494
                  biosfn_set_video_mode(0x6a);