i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* change c to cpp to resolve C89/C99 issue. (thanks Deadyak!)

Browse Source 
* 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
This commit is contained in:
Alexander von Gluck IV
2011-09-08 15:47:25 +00:00
parent 51928f9997
commit 6b8f21461e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/ata_adapter/Jamfile
+1 -1
View File
@@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ;
UsePrivateHeaders drivers kernel ; UsePrivateHeaders drivers kernel ;
KernelAddon ata_adapter : KernelAddon ata_adapter :
ata_adapter.c ata_adapter.cpp
; ;
src/add-ons/kernel/generic/ata_adapter/ata_adapter.c → src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp
View File
src/add-ons/kernel/generic/ide_adapter/Jamfile
+1 -1
View File
@@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons kernel generic ide_adapter ;
UsePrivateHeaders drivers kernel ; UsePrivateHeaders drivers kernel ;
KernelAddon ide_adapter : KernelAddon ide_adapter :
ide_adapter.c ide_adapter.cpp
; ;
src/add-ons/kernel/generic/ide_adapter/ide_adapter.c → src/add-ons/kernel/generic/ide_adapter/ide_adapter.cpp
+4 -4
View File
@@ -40,7 +40,7 @@ static device_manager_info *pnp;
static void static void
set_channel(ide_adapter_channel_info *channel, ide_channel ideChannel) 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 // acknowledge IRQ
status = pci->read_io_8(device, channel->command_block_base + 7); 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) if (channel != NULL)
// disable access instantly // 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) { if (controller != NULL) {
// disable access instantly; unit_device takes care of unregistering ioports // disable access instantly; unit_device takes care of unregistering ioports
atomic_or(&controller->lost, 1); atomic_or((int32*)&controller->lost, 1);
} }
} }