vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2007-11-10 Robert Millan <rmh@aybabtu.com> 

* commands/i386/pc/play.c (beep_off): Switch order of arguments
	in grub_outb() calls.
	(beep_on): Likewise.
This commit is contained in:
robertmh 2007-11-10 21:36:24 +00:00
parent 8b714eb0e1
commit 5cced7fd10
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-11-10 Robert Millan <rmh@aybabtu.com>
* commands/i386/pc/play.c (beep_off): Switch order of arguments
in grub_outb() calls.
(beep_on): Likewise.
2007-11-10 Christian Franke <franke@computer.org>
* normal/menu.c (run_menu): Check for empty menu to avoid crash.

13
commands/i386/pc/play.c
View File

@ -116,7 +116,7 @@ beep_off (void)
unsigned char status;
status = grub_inb (SPEAKER);
grub_outb (SPEAKER, status & ~(SPEAKER_TMR2 | SPEAKER_DATA));
grub_outb (status & ~(SPEAKER_TMR2 | SPEAKER_DATA), SPEAKER);
}
static void
@ -133,15 +133,14 @@ beep_on (short pitch)
counter = PIT_FREQUENCY / pitch;
/* Program timer 2. */
grub_outb (PIT_CTRL, PIT_CTRL_SELECT_2 | PIT_CTRL_READLOAD_WORD
| PIT_CTRL_SQUAREWAVE_GEN | PIT_CTRL_COUNT_BINARY);
grub_outb (PIT_COUNTER_2, counter & 0xff); /* LSB */
grub_outb (PIT_COUNTER_2, (counter >> 8) & 0xff); /* MSB */
grub_outb (PIT_CTRL_SELECT_2 | PIT_CTRL_READLOAD_WORD
| PIT_CTRL_SQUAREWAVE_GEN | PIT_CTRL_COUNT_BINARY, PIT_CTRL);
grub_outb (counter & 0xff, PIT_COUNTER_2); /* LSB */
grub_outb ((counter >> 8) & 0xff, PIT_COUNTER_2); /* MSB */
/* Start speaker. */
status = grub_inb (SPEAKER);
grub_outb (SPEAKER, status | SPEAKER_TMR2 | SPEAKER_DATA);
grub_outb (status | SPEAKER_TMR2 | SPEAKER_DATA, SPEAKER);
}
static grub_err_t