From 86003b2dbcd389cd21716752d62c7bfa31be2edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 30 Nov 2013 12:45:03 +0100 Subject: [PATCH] legacy_sata: c -> cpp, minor style cleanup --- ...{generic_ide_pci.c => generic_ide_pci.cpp} | 0 .../kernel/busses/ata/legacy_sata/Jamfile | 3 +- .../{legacy_sata.c => legacy_sata.cpp} | 62 +++++++++++-------- 3 files changed, 38 insertions(+), 27 deletions(-) rename src/add-ons/kernel/busses/ata/generic_ide_pci/{generic_ide_pci.c => generic_ide_pci.cpp} (100%) rename src/add-ons/kernel/busses/ata/legacy_sata/{legacy_sata.c => legacy_sata.cpp} (85%) diff --git a/src/add-ons/kernel/busses/ata/generic_ide_pci/generic_ide_pci.c b/src/add-ons/kernel/busses/ata/generic_ide_pci/generic_ide_pci.cpp similarity index 100% rename from src/add-ons/kernel/busses/ata/generic_ide_pci/generic_ide_pci.c rename to src/add-ons/kernel/busses/ata/generic_ide_pci/generic_ide_pci.cpp diff --git a/src/add-ons/kernel/busses/ata/legacy_sata/Jamfile b/src/add-ons/kernel/busses/ata/legacy_sata/Jamfile index 691cd31bb0..7c14cf5773 100644 --- a/src/add-ons/kernel/busses/ata/legacy_sata/Jamfile +++ b/src/add-ons/kernel/busses/ata/legacy_sata/Jamfile @@ -3,6 +3,5 @@ SubDir HAIKU_TOP src add-ons kernel busses ata legacy_sata ; UsePrivateHeaders drivers kernel ; KernelAddon legacy_sata : - legacy_sata.c + legacy_sata.cpp ; - diff --git a/src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.c b/src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.cpp similarity index 85% rename from src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.c rename to src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.cpp index 2df8255a03..8334ed891a 100644 --- a/src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.c +++ b/src/add-ons/kernel/busses/ata/legacy_sata/legacy_sata.cpp @@ -3,10 +3,13 @@ * Distributed under the terms of the MIT License. */ + +#include #include +#include + #include #include -#include #define DRIVER_PRETTY_NAME "Legacy SATA" @@ -232,15 +235,14 @@ controller_init(device_node *node, void **controller_cookie) static void controller_uninit(void *controller_cookie) { - sATAAdapter->uninit_controller(controller_cookie); + sATAAdapter->uninit_controller((ata_adapter_controller_info*)controller_cookie); } static void controller_removed(void *controller_cookie) { - sATAAdapter->controller_removed( - (ata_adapter_controller_info*)controller_cookie); + sATAAdapter->controller_removed((ata_adapter_controller_info*)controller_cookie); } @@ -249,92 +251,100 @@ channel_init(device_node *node, void **channel_cookie) { return sATAAdapter->init_channel(node, (ata_adapter_channel_info**)channel_cookie, - sizeof(ata_adapter_channel_info), - sATAAdapter->inthand); + sizeof(ata_adapter_channel_info), sATAAdapter->inthand); } static void channel_uninit(void *channel_cookie) { - sATAAdapter->uninit_channel(channel_cookie); + sATAAdapter->uninit_channel((ata_adapter_channel_info*)channel_cookie); } static void channel_removed(void *channel_cookie) { - sATAAdapter->channel_removed(channel_cookie); + sATAAdapter->channel_removed((ata_adapter_channel_info*)channel_cookie); } static void -channel_set(void *cookie, ata_channel channel) +channel_set(void *channel_cookie, ata_channel channel) { - sATAAdapter->set_channel((ata_adapter_channel_info *)cookie, channel); + sATAAdapter->set_channel((ata_adapter_channel_info*)channel_cookie, + channel); } static status_t task_file_write(void *channel_cookie, ata_task_file *tf, ata_reg_mask mask) { - return sATAAdapter->write_command_block_regs(channel_cookie,tf,mask); + return sATAAdapter->write_command_block_regs( + (ata_adapter_channel_info*)channel_cookie, tf, mask); } static status_t task_file_read(void *channel_cookie, ata_task_file *tf, ata_reg_mask mask) { - return sATAAdapter->read_command_block_regs(channel_cookie,tf,mask); + return sATAAdapter->read_command_block_regs( + (ata_adapter_channel_info*)channel_cookie, tf, mask); } static uint8 altstatus_read(void *channel_cookie) { - return sATAAdapter->get_altstatus(channel_cookie); + return sATAAdapter->get_altstatus( + (ata_adapter_channel_info*)channel_cookie); } static status_t device_control_write(void *channel_cookie, uint8 val) { - return sATAAdapter->write_device_control(channel_cookie,val); + return sATAAdapter->write_device_control( + (ata_adapter_channel_info*)channel_cookie, val); } static status_t pio_write(void *channel_cookie, uint16 *data, int count, bool force_16bit) { - return sATAAdapter->write_pio(channel_cookie,data,count,force_16bit); + return sATAAdapter->write_pio((ata_adapter_channel_info*)channel_cookie, + data, count, force_16bit); } static status_t pio_read(void *channel_cookie, uint16 *data, int count, bool force_16bit) { - return sATAAdapter->read_pio(channel_cookie,data,count,force_16bit); + return sATAAdapter->read_pio((ata_adapter_channel_info*)channel_cookie, + data, count, force_16bit); } static status_t -dma_prepare(void *channel_cookie, const physical_entry *sg_list, size_t sg_list_count, bool write) +dma_prepare(void *channel_cookie, const physical_entry *sg_list, + size_t sg_list_count, bool write) { - return sATAAdapter->prepare_dma(channel_cookie,sg_list,sg_list_count,write); + return sATAAdapter->prepare_dma((ata_adapter_channel_info*)channel_cookie, + sg_list, sg_list_count, write); } static status_t dma_start(void *channel_cookie) { - return sATAAdapter->start_dma(channel_cookie); + return sATAAdapter->start_dma((ata_adapter_channel_info*)channel_cookie); } static status_t dma_finish(void *channel_cookie) { - return sATAAdapter->finish_dma(channel_cookie); + return sATAAdapter->finish_dma((ata_adapter_channel_info*)channel_cookie); } @@ -385,11 +395,13 @@ static driver_module_info sControllerInterface = { NULL }, - .init_driver = &controller_init, - .uninit_driver = &controller_uninit, - .supports_device = &controller_supports, - .register_device = &controller_probe, - .device_removed = &controller_removed, + controller_supports, + controller_probe, + controller_init, + controller_uninit, + NULL, // register child devices + NULL, // rescan + controller_removed, }; module_info *modules[] = {