Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
operating-systems
ws21
assignments
Commits
7c4ef44d
Commit
7c4ef44d
authored
Oct 20, 2015
by
Curd Becker
Browse files
fixed boch's broken display handlers on ubuntu 14.04. replaced them with SDL as default
parent
48b5f50e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/utils/pintos
View file @
7c4ef44d
...
...
@@ -573,14 +573,15 @@ EOF
print_bochs_disk_line
("
ata1-master
",
$disks
[
2
]);
print_bochs_disk_line
("
ata1-slave
",
$disks
[
3
]);
if
(
$vga
ne
'
terminal
')
{
if
(
$serial
)
{
my
$mode
=
defined
(
$squish_pty
)
?
"
term
"
:
"
file
";
print
BOCHSRC
"
com1: enabled=1, mode=
$mode
, dev=/dev/stdout
\n
";
}
print
BOCHSRC
"
display_library: nogui
\n
"
if
$vga
eq
'
none
';
}
else
{
print
BOCHSRC
"
display_library: term
\n
";
if
(
$serial
)
{
my
$mode
=
defined
(
$squish_pty
)
?
"
term
"
:
"
file
";
print
BOCHSRC
"
com1: enabled=1, mode=
$mode
, dev=/dev/stdout
\n
";
}
}
# always use sdl, since term and x seem to be broken
# and nogui not present anymore (at least on Ubuntu 14.04 LTS)
print
BOCHSRC
"
display_library: sdl
\n
";
close
(
BOCHSRC
);
# Compose Bochs command line.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment