From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MISBp-0001dU-Tu for mharc-grub-devel@gnu.org; Sun, 21 Jun 2009 14:54:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MISBo-0001dN-7Y for grub-devel@gnu.org; Sun, 21 Jun 2009 14:54:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MISBj-0001d7-O1 for grub-devel@gnu.org; Sun, 21 Jun 2009 14:54:51 -0400 Received: from [199.232.76.173] (port=52071 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MISBj-0001d4-JJ for grub-devel@gnu.org; Sun, 21 Jun 2009 14:54:47 -0400 Received: from aybabtu.com ([69.60.117.155]:59074) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MISBj-0002VV-5g for grub-devel@gnu.org; Sun, 21 Jun 2009 14:54:47 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MIR8o-0004UX-Aj for grub-devel@gnu.org; Sun, 21 Jun 2009 19:47:42 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MISBg-0005cQ-3G for grub-devel@gnu.org; Sun, 21 Jun 2009 20:54:44 +0200 Date: Sun, 21 Jun 2009 20:54:44 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090621185444.GA21590@thorin> References: <20090621181748.GA21152@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="CE+1k2dSO48ffgeK" Content-Disposition: inline In-Reply-To: <20090621181748.GA21152@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1) Subject: [PATCH] move grub_stop() (Re: [PATCH] i386-qemu port) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2009 18:54:52 -0000 --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Move grub_stop to init.c to ease code sharing with i386-qemu. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --CE+1k2dSO48ffgeK Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="stop.diff" 2009-06-21 Robert Millan * kern/i386/coreboot/startup.S (grub_stop): Move from here ... * kern/i386/coreboot/init.c (grub_stop): ... to here. Index: kern/i386/coreboot/startup.S =================================================================== --- kern/i386/coreboot/startup.S (revision 2353) +++ kern/i386/coreboot/startup.S (working copy) @@ -78,14 +78,6 @@ codestart: jmp EXT_C(grub_main) /* - * This call is special... it never returns... in fact it should simply - * hang at this point! - */ -FUNCTION(grub_stop) - hlt - jmp EXT_C(grub_stop) - -/* * prot_to_real and associated structures (but NOT real_to_prot, that is * only needed for BIOS gates). */ Index: kern/i386/coreboot/init.c =================================================================== --- kern/i386/coreboot/init.c (revision 2353) +++ kern/i386/coreboot/init.c (working copy) @@ -50,6 +50,17 @@ grub_get_rtc (void) grub_fatal ("grub_get_rtc() is not implemented.\n"); } +/* + * This call is special... it never returns... in fact it should simply + * hang at this point! + */ +void +grub_stop () +{ + while (1) + grub_cpu_idle (); +} + /* Stop the floppy drive from spinning, so that other software is jumped to with a known state. */ void --CE+1k2dSO48ffgeK--