From 401dc4d427bbae3c0c381dcf0b53edcca3282c7b Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 6 May 2018 23:29:36 +0100 Subject: [PATCH] mbr: wire up dymamic swap detection (partition type 0x7F) --- Kernel/dev/mbr.c | 2 +- Kernel/include/kernel.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Kernel/dev/mbr.c b/Kernel/dev/mbr.c index 28f1ccb9..88b6c968 100644 --- a/Kernel/dev/mbr.c +++ b/Kernel/dev/mbr.c @@ -87,7 +87,7 @@ void mbr_parse(char letter) kprintf("hd%c%d ", letter, next); #ifdef CONFIG_DYNAMIC_SWAP if(t == FUZIX_SWAP) - platform_swap_found(next - 1); + platform_swap_found(letter, next); #endif } } diff --git a/Kernel/include/kernel.h b/Kernel/include/kernel.h index dcf94cca..1b852eeb 100644 --- a/Kernel/include/kernel.h +++ b/Kernel/include/kernel.h @@ -1037,11 +1037,12 @@ extern uint8_t platform_param(char *p); extern void platform_switchout(void); extern void platform_interrupt(void); +extern void platform_swap_found(uint8_t part, uint8_t letter); + extern irqflags_t __hard_di(void); extern void __hard_irqrestore(irqflags_t f); extern void __hard_ei(void); - #ifndef CONFIG_SOFT_IRQ #define di __hard_di #define irqrestore __hard_irqrestore -- 2.34.1