From f8f63bc7eba61a8bee248613f7edf0bd621abcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 29 Jun 2005 14:57:29 +0000 Subject: [PATCH] Buidl fix, courtesy of John Drinkwater. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13348 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/busses/ide/promise_tx2/promise_tx2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/busses/ide/promise_tx2/promise_tx2.c b/src/add-ons/kernel/busses/ide/promise_tx2/promise_tx2.c index e515a10cf9..c1888a6b80 100644 --- a/src/add-ons/kernel/busses/ide/promise_tx2/promise_tx2.c +++ b/src/add-ons/kernel/busses/ide/promise_tx2/promise_tx2.c @@ -12,7 +12,7 @@ #include #include -#include +#include #define debug_level_flow 0 #define debug_level_error 3 @@ -203,13 +203,13 @@ publish_controller(device_node_handle parent, uint16 bus_master_base, uint8 intn // DMA properties // some say it must be dword-aligned, others that it can be byte-aligned; // stay on the safe side - { BLKDEV_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 3 }}, + { B_BLOCK_DEVICE_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 3 }}, // one S/G block must not cross 64K boundary - { BLKDEV_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: 0xffff }}, + { B_BLOCK_DEVICE_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: 0xffff }}, // size of S/G block is 16 bits with zero being 64K - { BLKDEV_MAX_SG_BLOCK_SIZE, B_UINT32_TYPE, { ui32: 0x10000 }}, + { B_BLOCK_DEVICE_MAX_SG_BLOCK_SIZE, B_UINT32_TYPE, { ui32: 0x10000 }}, // see definition of MAX_SG_COUNT - { BLKDEV_MAX_SG_BLOCKS, B_UINT32_TYPE, { ui32: IDE_ADAPTER_MAX_SG_COUNT }}, + { B_BLOCK_DEVICE_MAX_SG_BLOCKS, B_UINT32_TYPE, { ui32: IDE_ADAPTER_MAX_SG_COUNT }}, // private data to find controller { IDE_ADAPTER_BUS_MASTER_BASE, B_UINT16_TYPE, { ui16: bus_master_base }},