Changeset 26506 in vbox
- Timestamp:
- Feb 14, 2010 9:25:17 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
.scm-settings (modified) (4 diffs)
-
src/VBox/Devices/Audio/pulse_stubs.c (modified) (3 diffs)
-
src/VBox/Devices/Graphics/BIOS/vbe.c (modified) (5 diffs)
-
src/VBox/Devices/Graphics/BIOS/vgabios.c (modified) (3 diffs)
-
src/VBox/Devices/PC/DevPcArch.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/.scm-settings
r26503 r26506 41 41 --filter-out-dirs "*/debian/." 42 42 --filter-out-dirs "*/SlickEdit/." 43 --filter-out-dirs "*/src/libs/ ."43 --filter-out-dirs "*/src/libs/*/." 44 44 --filter-out-dirs "*/src/apps/kchmviewer*/." 45 45 --filter-out-dirs "*/src/VBox/Additions/x11/x11include/." 46 46 --filter-out-dirs "*/src/VBox/Additions/WINNT/Graphics/Wine/." 47 --filter-out-dirs "*/src/VBox/Additions/WINNT/Network/freebsd/." 47 48 --filter-out-dirs "*/src/VBox/Additions/WINNT/i8042prt/include/." 48 49 --filter-out-dirs "*/src/VBox/Additions/common/crOpenGL/." 50 --filter-out-dirs "*/src/VBox/Additions/solaris/DRM/include/." 51 --filter-out-dirs "*/src/VBox/Additions/solaris/SharedFolders/solaris10/sys/." 49 52 --filter-out-dirs "*/src/VBox/HostServices/SharedOpenGL/." 50 53 --filter-out-dirs "*/src/VBox/GuestHost/OpenGL/*/." … … 67 70 --filter-out-files "*/include/VBox/HostServices/wglext.h" 68 71 --filter-out-files "*/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h" 72 --filter-out-files "*/src/VBox/Devices/Audio/sys-queue.h" 69 73 70 74 … … 72 76 # Other options. 73 77 # 74 */src/Devices/slirp/*: --no-convert-tabs 78 */src/VBox/Additions/solaris/SharedFolders/*: --no-convert-tabs 79 */src/VBox/Additions/x11/vboxmouse/*mouse*: --no-convert-tabs 80 */src/VBox/Additions/x11/vboxmouse/*pnp.c: --no-convert-tabs 81 */src/VBox/Additions/x11/vboxvideo/vboxvideo*.c: --no-convert-tabs 82 */src/VBox/Additions/x11/vboxvideo/vboxvideo*.h: --no-convert-tabs 83 */src/VBox/Devices/Network/slirp/*: --no-convert-tabs 84 */src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/Edid.c: --no-convert-tabs 85 */src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/*.*: --no-convert-tabs 86 */src/recompiler/*: --no-convert-tabs 87 */src/recompiler/VBox*: --convert-tabs 88 */src/apps/tunctl/tunctl.c: --no-convert-tabs 89 vboxvideo_drm.c: --no-convert-tabs 75 90 76 91 … … 82 97 --filter-out-dirs "*/src/VBox/Additions/os2/VBoxMouse/." 83 98 --filter-out-dirs "*/src/VBox/Devices/PC/PXE/." 99 */src/VBox/Additions/solaris/Installer/postinstall.sh: --no-convert-tabs 84 100 85 --no-convert-tabs101 # --no-convert-tabs 86 102 -
trunk/src/VBox/Devices/Audio/pulse_stubs.c
r26289 r26506 90 90 PROXY_STUB (pa_stream_trigger, pa_operation*, 91 91 (pa_stream *s, pa_stream_success_cb_t cb, void *userdata), 92 (s, cb, userdata))92 (s, cb, userdata)) 93 93 PROXY_STUB (pa_stream_new, pa_stream*, 94 94 (pa_context *c, const char *name, const pa_sample_spec *ss, … … 179 179 PROXY_STUB (pa_operation_get_state, pa_operation_state_t, 180 180 (pa_operation *o), 181 (o))181 (o)) 182 182 PROXY_STUB (pa_strerror, const char*, 183 183 (int error), … … 185 185 PROXY_STUB (pa_stream_readable_size, size_t, 186 186 (pa_stream *p), 187 (p))187 (p)) 188 188 189 189 -
trunk/src/VBox/Devices/Graphics/BIOS/vbe.c
r26003 r26506 86 86 //.ascii "Bochs VBE Display Adapter enabled" 87 87 .ascii "VirtualBox VBE Display Adapter enabled" 88 .byte 0x0a,0x0d89 .byte 0x0a,0x0d90 .byte 0x0088 .byte 0x0a,0x0d 89 .byte 0x0a,0x0d 90 .byte 0x00 91 91 92 92 _no_vbebios_info_string: 93 93 .ascii "No VirtualBox VBE support available!" 94 .byte 0x0a,0x0d95 .byte 0x0a,0x0d96 .byte 0x0094 .byte 0x0a,0x0d 95 .byte 0x0a,0x0d 96 .byte 0x00 97 97 98 98 #ifdef DEBUG … … 101 101 .ascii VBOX_VERSION_STRING 102 102 .ascii " VBE Display Adapter" 103 .byte 0x0a,0x0d, 0x00103 .byte 0x0a,0x0d, 0x00 104 104 #endif 105 105 … … 1207 1207 1208 1208 if (vbe2_info) 1209 {1209 { 1210 1210 // OEM Stuff 1211 1211 write_word(ES, DI + RT_OFFSETOF(VbeInfoBlock, OemSoftwareRev), VBE_OEM_SOFTWARE_REV); … … 1268 1268 1269 1269 if (vbe2_info) 1270 {1270 { 1271 1271 // OEM Stuff 1272 1272 vbe_info_block.OemSoftwareRev = VBE_OEM_SOFTWARE_REV; … … 1281 1281 memcpyb(ES, DI, ss, &vbe_info_block, sizeof(vbe_info_block)); 1282 1282 } 1283 else1284 {1283 else 1284 { 1285 1285 // copy updates in vbe_info_block back (VBE 1.x compatibility) 1286 1286 memcpyb(ES, DI, ss, &vbe_info_block, 256); 1287 }1287 } 1288 1288 #endif /* !VBOX */ 1289 1289 -
trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c
r26003 r26506 147 147 148 148 vgabios_start: 149 .byte 0x55, 0xaa/* BIOS signature, required for BIOS extensions */150 151 .byte 0x40/* BIOS extension length in units of 512 bytes */149 .byte 0x55, 0xaa /* BIOS signature, required for BIOS extensions */ 150 151 .byte 0x40 /* BIOS extension length in units of 512 bytes */ 152 152 153 153 … … 160 160 .ascii "VirtualBox VGA BIOS" 161 161 #else 162 .ascii "Plex86/Bochs VGABios"163 #endif 164 .ascii " "165 .byte 0x00162 .ascii "Plex86/Bochs VGABios" 163 #endif 164 .ascii " " 165 .byte 0x00 166 166 167 167 // Info from Bart Oldeman … … 173 173 vgabios_version: 174 174 #ifndef VGABIOS_VERS 175 .ascii "current-cvs"175 .ascii "current-cvs" 176 176 #else 177 177 .ascii VGABIOS_VERS 178 178 #endif 179 .ascii " "179 .ascii " " 180 180 181 181 vgabios_date: 182 182 .ascii VGABIOS_DATE 183 183 .byte 0x0a,0x0d 184 .byte 0x00184 .byte 0x00 185 185 #endif 186 186 187 187 #ifndef VBOX 188 188 vgabios_copyright: 189 .ascii "(C) 2003 the LGPL VGABios developers Team"190 .byte 0x0a,0x0d191 .byte 0x00189 .ascii "(C) 2003 the LGPL VGABios developers Team" 190 .byte 0x0a,0x0d 191 .byte 0x00 192 192 #endif 193 193 194 194 #ifndef VBOX 195 195 vgabios_license: 196 .ascii "This VGA/VBE Bios is released under the GNU LGPL"197 .byte 0x0a,0x0d198 .byte 0x0a,0x0d199 .byte 0x00196 .ascii "This VGA/VBE Bios is released under the GNU LGPL" 197 .byte 0x0a,0x0d 198 .byte 0x0a,0x0d 199 .byte 0x00 200 200 201 201 vgabios_website: 202 .ascii "Please visit :"203 .byte 0x0a,0x0d202 .ascii "Please visit :" 203 .byte 0x0a,0x0d 204 204 ;;.ascii " . http://www.plex86.org" 205 ;;.byte 0x0a,0x0d206 .ascii " . http://bochs.sourceforge.net"207 .byte 0x0a,0x0d208 .ascii " . http://www.nongnu.org/vgabios"209 .byte 0x0a,0x0d210 .byte 0x0a,0x0d211 .byte 0x00205 ;;.byte 0x0a,0x0d 206 .ascii " . http://bochs.sourceforge.net" 207 .byte 0x0a,0x0d 208 .ascii " . http://www.nongnu.org/vgabios" 209 .byte 0x0a,0x0d 210 .byte 0x0a,0x0d 211 .byte 0x00 212 212 #endif 213 213 -
trunk/src/VBox/Devices/PC/DevPcArch.c
r26173 r26506 149 149 150 150 Bitfields for PS/2 system control port A: 151 Bit(s) Description(Table P0415)152 7-6 any bit set to 1 turns activity light on153 5 unused154 4 watchdog timout occurred155 3 =0 RTC/CMOS security lock (on password area) unlocked156 =1 CMOS locked (done by POST)157 2 unused158 1 A20 is active159 0 =0 system reset or write160 =1 pulse alternate reset pin (high-speed alternate CPU reset)161 Notes: once set, bit 3 may only be cleared by a power-on reset162 on at least the C&T 82C235, bit 0 remains set through a CPU reset to163 allow the BIOS to determine the reset method164 on the PS/2 30-286 & "Tortuga" the INT 15h/87h memory copy does165 not use this port for A20 control, but instead uses the keyboard166 controller (8042). Reportedly this may cause the system to crash167 when access to the 8042 is disabled in password server mode168 (see #P0398).151 Bit(s) Description (Table P0415) 152 7-6 any bit set to 1 turns activity light on 153 5 unused 154 4 watchdog timout occurred 155 3 =0 RTC/CMOS security lock (on password area) unlocked 156 =1 CMOS locked (done by POST) 157 2 unused 158 1 A20 is active 159 0 =0 system reset or write 160 =1 pulse alternate reset pin (high-speed alternate CPU reset) 161 Notes: once set, bit 3 may only be cleared by a power-on reset 162 on at least the C&T 82C235, bit 0 remains set through a CPU reset to 163 allow the BIOS to determine the reset method 164 on the PS/2 30-286 & "Tortuga" the INT 15h/87h memory copy does 165 not use this port for A20 control, but instead uses the keyboard 166 controller (8042). Reportedly this may cause the system to crash 167 when access to the 8042 is disabled in password server mode 168 (see #P0398). 169 169 SeeAlso: #P0416,#P0417,MSR 00001000h 170 170 * @endverbatim
Note:
See TracChangeset
for help on using the changeset viewer.

