[ipxe-devel] Setup INT13 partition on usb images only ifdef CONSOLE_INT13

[Geert Stappers]

On Thu, Feb 27, 2020 at 09:47:05AM +0900, Romain Guyard wrote:
> 
> Hello,
> 
> On 2/27/20 7:09 AM, Geert Stappers wrote:
> > On Sun, Feb 23, 2020 at 03:45:33PM -0800, Robien wrote:
> >>> The patch feels wrong, surely **no** _Looks Good To Me_.
> >>
> >> Can you elaborate a bit so I can make it better?
> >>
> > 
> > Find it attached
> 
> 
> Thank you for your help.
> 
> I tried your patch and unfortunately it is not working on my hardware.

Noted.


> When I try to boot, I got a black screen and my motherboard's speaker
> screams some weird sound that I've never heard before. So thank you for
> the musical discovery of the day.
> 
> The first idea of the patch was to not add any new code to avoid any
> regression. That is why I took the assembly code from before the commit
> that added CONSOLE_INT13 option and merged to the current version.
> Can you explain your changes?

Here the `diff`,   "explain" in next message.


--- a/src/arch/x86/prefix/usbdisk.S
+++ b/src/arch/x86/prefix/usbdisk.S
@@ -10,12 +10,11 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
 #include "mbr.S"
 
-#ifdef CONSOLE_INT13
-
 /* Partition table: 64 heads, 32 sectors/track (ZIP-drive compatible)
 * */
 	.org 446
 	.space 16
 	.space 16
+#ifdef CONSOLE_INT13
 	/* Partition 3: log partition (for CONSOLE_INT13) */
 	.byte 0x00, 0x01, 0x01, 0x00
 	.byte 0xe0, 0x3f, 0x20, 0x00
@@ -38,21 +37,17 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 	.org 2048 * 512
 
 #else /* CONSOLE_INT13 */
-
-/* Partition table: 64 heads, 32 sectors/track (ZIP-drive compatible)
*/
-	.org 446
-	.space 16
-	.space 16
 	.space 16
+	/* Partition 4: boot partition */
 	.byte 0x80, 0x01, 0x01, 0x00
 	.byte 0xeb, 0x3f, 0x20, 0x01
 	.long 0x00000020
-	.long 0x00000fe0
+	.long 0x00000820
 
 	.org 510
 	.byte 0x55, 0xaa
 
-/* Skip to start of partition */
+/* Skip to start of boot partition */
 	.org 32 * 512
 
 #endif



Regards
Geert Stappers
-- 
Silence is hard to parse