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

2001-10-27 Yoshinori K. Okuji <okuji@gnu.org>

Browse source 
* stage2/apm.S: Always disconnect from APM. Written by Erich
	Stefan Boleyn.

	* util/Makefile.am (noinst_DATA): Removed.
	(EXTRA_DIST): Likewise.
This commit is contained in:
okuji 2001-10-27 14:48:39 +00:00
parent e5fd53e574
commit 36fd6bd0fa
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2001-10-27 Yoshinori K. Okuji <okuji@gnu.org>
* stage2/apm.S: Always disconnect from APM. Written by Erich
Stefan Boleyn.
* util/Makefile.am (noinst_DATA): Removed.
(EXTRA_DIST): Likewise.
2001-10-14 Gordon Matzigkeit <gord@fig.org> 2001-10-14 Gordon Matzigkeit <gord@fig.org>
* configure.in: Explicitly call _AM_DEPENDENCIES(CC) for the * configure.in: Explicitly call _AM_DEPENDENCIES(CC) for the

20
stage2/apm.S
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2000 Free Software Foundation, Inc. * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -91,12 +91,12 @@ ENTRY(get_apm_info)
xorw %cx, %cx xorw %cx, %cx
int $0x15 int $0x15
/* error -> should not happen, tidy up */ /* error -> should not happen, tidy up */
jc apm_disconnect jc done_apm_bios
/* check for "PM" signature */ /* check for "PM" signature */
cmpw $0x504d, %bx cmpw $0x504d, %bx
/* no signature -> should not happen, tidy up */ /* no signature -> should not happen, tidy up */
jne apm_disconnect jne done_apm_bios
/* record the APM BIOS version */ /* record the APM BIOS version */
movw %ax, ABS(EXT_C(apm_bios_info)) movw %ax, ABS(EXT_C(apm_bios_info))
@ -104,19 +104,17 @@ ENTRY(get_apm_info)
movw %cx, ABS(EXT_C(apm_bios_info)) + 12 movw %cx, ABS(EXT_C(apm_bios_info)) + 12
jmp done_apm_bios jmp done_apm_bios
apm_disconnect:
/* Disconnect */
movw $0x5304, %ax
xorw %bx, %bx
/* ignore return code */
int $0x15
jmp done_apm_bios
no_32_apm_bios: no_32_apm_bios:
/* remove 32 bit support bit */ /* remove 32 bit support bit */
andw $0xfffd, ABS(EXT_C(apm_bios_info)) + 12 andw $0xfffd, ABS(EXT_C(apm_bios_info)) + 12
done_apm_bios: done_apm_bios:
/* Some paranoia here: Always Disconnect from APM */
movw $0x5304, %ax
xorw %bx, %bx
/* ignore return code */
int $0x15
DATA32 call EXT_C(real_to_prot) DATA32 call EXT_C(real_to_prot)
.code32 .code32

4
util/Makefile.am
View file

@ -1,9 +1,9 @@
bin_PROGRAMS = mbchk bin_PROGRAMS = mbchk
sbin_SCRIPTS = grub-install grub-md5-crypt sbin_SCRIPTS = grub-install grub-md5-crypt
noinst_SCRIPTS = grub-image noinst_SCRIPTS = grub-image
noinst_DATA = menu.lst #noinst_DATA = menu.lst
EXTRA_DIST = $(noinst_DATA) #EXTRA_DIST = $(noinst_DATA)
# XXX: Need to search for a header file in docs, because of multiboot.h. # XXX: Need to search for a header file in docs, because of multiboot.h.
AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs

8
util/Makefile.in
View file

@ -89,9 +89,9 @@ install_sh = @install_sh@
bin_PROGRAMS = mbchk bin_PROGRAMS = mbchk
sbin_SCRIPTS = grub-install grub-md5-crypt sbin_SCRIPTS = grub-install grub-md5-crypt
noinst_SCRIPTS = grub-image noinst_SCRIPTS = grub-image
noinst_DATA = menu.lst #noinst_DATA = menu.lst
EXTRA_DIST = $(noinst_DATA) #EXTRA_DIST = $(noinst_DATA)
# XXX: Need to search for a header file in docs, because of multiboot.h. # XXX: Need to search for a header file in docs, because of multiboot.h.
AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs
@ -125,8 +125,6 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
DIST_SOURCES = $(mbchk_SOURCES) DIST_SOURCES = $(mbchk_SOURCES)
DATA = $(noinst_DATA)
DIST_COMMON = Makefile.am Makefile.in grub-image.in grub-install.in \ DIST_COMMON = Makefile.am Makefile.in grub-image.in grub-install.in \
grub-md5-crypt.in grub-md5-crypt.in
SOURCES = $(mbchk_SOURCES) SOURCES = $(mbchk_SOURCES)
@ -276,7 +274,7 @@ distdir: $(DISTFILES)
done done
check-am: all-am check-am: all-am
check: check-am check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-am: Makefile $(PROGRAMS) $(SCRIPTS)
installdirs: installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)