From 6b8f21461e9f89bab101975a57d5475d19e91062 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 8 Sep 2011 15:47:25 +0000 Subject: [PATCH] * change c to cpp to resolve C89/C99 issue. (thanks Deadyak!) * changing to cpp uncovered a few bugs in ide_adaptor * correct losing signed integer * correct a variable name that conflicted with a type * gcc2 build now fixed after r42724 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42725 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/generic/ata_adapter/Jamfile | 2 +- .../ata_adapter/{ata_adapter.c => ata_adapter.cpp} | 0 src/add-ons/kernel/generic/ide_adapter/Jamfile | 2 +- .../ide_adapter/{ide_adapter.c => ide_adapter.cpp} | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/add-ons/kernel/generic/ata_adapter/{ata_adapter.c => ata_adapter.cpp} (100%) rename src/add-ons/kernel/generic/ide_adapter/{ide_adapter.c => ide_adapter.cpp} (99%) diff --git a/src/add-ons/kernel/generic/ata_adapter/Jamfile b/src/add-ons/kernel/generic/ata_adapter/Jamfile index 01d423f8e7..7f846d7d90 100644 --- a/src/add-ons/kernel/generic/ata_adapter/Jamfile +++ b/src/add-ons/kernel/generic/ata_adapter/Jamfile @@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ; UsePrivateHeaders drivers kernel ; KernelAddon ata_adapter : - ata_adapter.c + ata_adapter.cpp ; diff --git a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp similarity index 100% rename from src/add-ons/kernel/generic/ata_adapter/ata_adapter.c rename to src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp diff --git a/src/add-ons/kernel/generic/ide_adapter/Jamfile b/src/add-ons/kernel/generic/ide_adapter/Jamfile index 83d8b92d3b..5ffd794197 100644 --- a/src/add-ons/kernel/generic/ide_adapter/Jamfile +++ b/src/add-ons/kernel/generic/ide_adapter/Jamfile @@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel generic ide_adapter ; UsePrivateHeaders drivers kernel ; KernelAddon ide_adapter : - ide_adapter.c + ide_adapter.cpp ; diff --git a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp similarity index 99% rename from src/add-ons/kernel/generic/ide_adapter/ide_adapter.c rename to src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp index 6770fa0ec6..f7a5d2c7e0 100644 --- a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c +++ b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp @@ -40,7 +40,7 @@ static device_manager_info *pnp; static void set_channel(ide_adapter_channel_info *channel, ide_channel ideChannel) { - channel->ide_channel = ideChannel; + channel->ideChannel = ideChannel; } @@ -212,7 +212,7 @@ ide_adapter_inthand(void *arg) // acknowledge IRQ status = pci->read_io_8(device, channel->command_block_base + 7); - return ide->irq_handler(channel->ide_channel, status); + return ide->irq_handler(channel->ideChannel, status); } @@ -460,7 +460,7 @@ ide_adapter_channel_removed(ide_adapter_channel_info *channel) if (channel != NULL) // disable access instantly - atomic_or(&channel->lost, 1); + atomic_or((int32*)&channel->lost, 1); } @@ -644,7 +644,7 @@ ide_adapter_controller_removed(ide_adapter_controller_info *controller) if (controller != NULL) { // disable access instantly; unit_device takes care of unregistering ioports - atomic_or(&controller->lost, 1); + atomic_or((int32*)&controller->lost, 1); } }