Re: [PATCH v6 10/16] floppy: move cmos_get_fd_drive_type() from pc
On Wed, May 20, 2020 at 10:43:03AM +0200, Gerd Hoffmann wrote: > On Tue, May 19, 2020 at 04:51:44PM +0200, Philippe Mathieu-Daudé wrote: > > Missing "Signed-off-by: Gerd Hoffmann ", > > otherwise: > > Signed-off-by: Gerd Hoffmann > > mst, can you pick that up or should I respin? > > thanks, > Gerd Not a problem.
Re: [PATCH v6 10/16] floppy: move cmos_get_fd_drive_type() from pc
On Tue, May 19, 2020 at 04:51:44PM +0200, Philippe Mathieu-Daudé wrote: > Missing "Signed-off-by: Gerd Hoffmann ", > otherwise: Signed-off-by: Gerd Hoffmann mst, can you pick that up or should I respin? thanks, Gerd
Re: [PATCH v6 10/16] floppy: move cmos_get_fd_drive_type() from pc
On 5/19/20 10:51 AM, Philippe Mathieu-Daudé wrote: > Missing "Signed-off-by: Gerd Hoffmann ", > otherwise: > > Reviewed-by: Philippe Mathieu-Daudé > > On 5/15/20 5:04 PM, Gerd Hoffmann wrote: If you add the S-O-B: Acked-by: John Snow >> --- >> include/hw/block/fdc.h | 1 + >> include/hw/i386/pc.h | 1 - >> hw/block/fdc.c | 26 +- >> hw/i386/pc.c | 25 - >> 4 files changed, 26 insertions(+), 27 deletions(-) >> >> diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h >> index 5d71cf972268..479cebc0a330 100644 >> --- a/include/hw/block/fdc.h >> +++ b/include/hw/block/fdc.h >> @@ -16,5 +16,6 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, >> DriveInfo **fds, qemu_irq *fdc_tc); >> FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); >> +int cmos_get_fd_drive_type(FloppyDriveType fd0); >> #endif >> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h >> index 8d764f965cd3..5e3b19ab78fc 100644 >> --- a/include/hw/i386/pc.h >> +++ b/include/hw/i386/pc.h >> @@ -176,7 +176,6 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); >> void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs); >> ISADevice *pc_find_fdc0(void); >> -int cmos_get_fd_drive_type(FloppyDriveType fd0); >> /* port92.c */ >> #define PORT92_A20_LINE "a20" >> diff --git a/hw/block/fdc.c b/hw/block/fdc.c >> index 8024c822cea3..ea0fb8ee15b9 100644 >> --- a/hw/block/fdc.c >> +++ b/hw/block/fdc.c >> @@ -32,7 +32,6 @@ >> #include "qapi/error.h" >> #include "qemu/error-report.h" >> #include "qemu/timer.h" >> -#include "hw/i386/pc.h" >> #include "hw/acpi/aml-build.h" >> #include "hw/irq.h" >> #include "hw/isa/isa.h" >> @@ -2809,6 +2808,31 @@ static Aml *build_fdinfo_aml(int idx, >> FloppyDriveType type) >> return dev; >> } >> +int cmos_get_fd_drive_type(FloppyDriveType fd0) >> +{ >> + int val; >> + >> + switch (fd0) { >> + case FLOPPY_DRIVE_TYPE_144: >> + /* 1.44 Mb 3"5 drive */ >> + val = 4; >> + break; >> + case FLOPPY_DRIVE_TYPE_288: >> + /* 2.88 Mb 3"5 drive */ >> + val = 5; >> + break; >> + case FLOPPY_DRIVE_TYPE_120: >> + /* 1.2 Mb 5"5 drive */ >> + val = 2; >> + break; >> + case FLOPPY_DRIVE_TYPE_NONE: >> + default: >> + val = 0; >> + break; >> + } >> + return val; >> +} >> + >> static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) >> { >> Aml *dev; >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index 2128f3d6fe8b..c5db7be6d8b1 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -385,31 +385,6 @@ static uint64_t ioportF0_read(void *opaque, >> hwaddr addr, unsigned size) >> #define REG_EQUIPMENT_BYTE 0x14 >> -int cmos_get_fd_drive_type(FloppyDriveType fd0) >> -{ >> - int val; >> - >> - switch (fd0) { >> - case FLOPPY_DRIVE_TYPE_144: >> - /* 1.44 Mb 3"5 drive */ >> - val = 4; >> - break; >> - case FLOPPY_DRIVE_TYPE_288: >> - /* 2.88 Mb 3"5 drive */ >> - val = 5; >> - break; >> - case FLOPPY_DRIVE_TYPE_120: >> - /* 1.2 Mb 5"5 drive */ >> - val = 2; >> - break; >> - case FLOPPY_DRIVE_TYPE_NONE: >> - default: >> - val = 0; >> - break; >> - } >> - return val; >> -} >> - >> static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs, >> int16_t cylinders, int8_t heads, int8_t >> sectors) >> { >> > -- —js
Re: [PATCH v6 10/16] floppy: move cmos_get_fd_drive_type() from pc
Missing "Signed-off-by: Gerd Hoffmann ", otherwise: Reviewed-by: Philippe Mathieu-Daudé On 5/15/20 5:04 PM, Gerd Hoffmann wrote: --- include/hw/block/fdc.h | 1 + include/hw/i386/pc.h | 1 - hw/block/fdc.c | 26 +- hw/i386/pc.c | 25 - 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 5d71cf972268..479cebc0a330 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,5 +16,6 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); +int cmos_get_fd_drive_type(FloppyDriveType fd0); #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8d764f965cd3..5e3b19ab78fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -176,7 +176,6 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs); ISADevice *pc_find_fdc0(void); -int cmos_get_fd_drive_type(FloppyDriveType fd0); /* port92.c */ #define PORT92_A20_LINE "a20" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 8024c822cea3..ea0fb8ee15b9 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/i386/pc.h" #include "hw/acpi/aml-build.h" #include "hw/irq.h" #include "hw/isa/isa.h" @@ -2809,6 +2808,31 @@ static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) return dev; } +int cmos_get_fd_drive_type(FloppyDriveType fd0) +{ +int val; + +switch (fd0) { +case FLOPPY_DRIVE_TYPE_144: +/* 1.44 Mb 3"5 drive */ +val = 4; +break; +case FLOPPY_DRIVE_TYPE_288: +/* 2.88 Mb 3"5 drive */ +val = 5; +break; +case FLOPPY_DRIVE_TYPE_120: +/* 1.2 Mb 5"5 drive */ +val = 2; +break; +case FLOPPY_DRIVE_TYPE_NONE: +default: +val = 0; +break; +} +return val; +} + static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) { Aml *dev; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2128f3d6fe8b..c5db7be6d8b1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -385,31 +385,6 @@ static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size) #define REG_EQUIPMENT_BYTE 0x14 -int cmos_get_fd_drive_type(FloppyDriveType fd0) -{ -int val; - -switch (fd0) { -case FLOPPY_DRIVE_TYPE_144: -/* 1.44 Mb 3"5 drive */ -val = 4; -break; -case FLOPPY_DRIVE_TYPE_288: -/* 2.88 Mb 3"5 drive */ -val = 5; -break; -case FLOPPY_DRIVE_TYPE_120: -/* 1.2 Mb 5"5 drive */ -val = 2; -break; -case FLOPPY_DRIVE_TYPE_NONE: -default: -val = 0; -break; -} -return val; -} - static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs, int16_t cylinders, int8_t heads, int8_t sectors) {
[PATCH v6 10/16] floppy: move cmos_get_fd_drive_type() from pc
--- include/hw/block/fdc.h | 1 + include/hw/i386/pc.h | 1 - hw/block/fdc.c | 26 +- hw/i386/pc.c | 25 - 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 5d71cf972268..479cebc0a330 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,5 +16,6 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); +int cmos_get_fd_drive_type(FloppyDriveType fd0); #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8d764f965cd3..5e3b19ab78fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -176,7 +176,6 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs); ISADevice *pc_find_fdc0(void); -int cmos_get_fd_drive_type(FloppyDriveType fd0); /* port92.c */ #define PORT92_A20_LINE "a20" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 8024c822cea3..ea0fb8ee15b9 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/i386/pc.h" #include "hw/acpi/aml-build.h" #include "hw/irq.h" #include "hw/isa/isa.h" @@ -2809,6 +2808,31 @@ static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) return dev; } +int cmos_get_fd_drive_type(FloppyDriveType fd0) +{ +int val; + +switch (fd0) { +case FLOPPY_DRIVE_TYPE_144: +/* 1.44 Mb 3"5 drive */ +val = 4; +break; +case FLOPPY_DRIVE_TYPE_288: +/* 2.88 Mb 3"5 drive */ +val = 5; +break; +case FLOPPY_DRIVE_TYPE_120: +/* 1.2 Mb 5"5 drive */ +val = 2; +break; +case FLOPPY_DRIVE_TYPE_NONE: +default: +val = 0; +break; +} +return val; +} + static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) { Aml *dev; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2128f3d6fe8b..c5db7be6d8b1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -385,31 +385,6 @@ static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size) #define REG_EQUIPMENT_BYTE 0x14 -int cmos_get_fd_drive_type(FloppyDriveType fd0) -{ -int val; - -switch (fd0) { -case FLOPPY_DRIVE_TYPE_144: -/* 1.44 Mb 3"5 drive */ -val = 4; -break; -case FLOPPY_DRIVE_TYPE_288: -/* 2.88 Mb 3"5 drive */ -val = 5; -break; -case FLOPPY_DRIVE_TYPE_120: -/* 1.2 Mb 5"5 drive */ -val = 2; -break; -case FLOPPY_DRIVE_TYPE_NONE: -default: -val = 0; -break; -} -return val; -} - static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs, int16_t cylinders, int8_t heads, int8_t sectors) { -- 2.18.4