* Ported ide_isa module to the new driver architecture.

* Minor cleanup of ide_isa, and generic_ide_pci (removed wrapper.h).
* Added ide_isa back to the image.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25755 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/HaikuImage

@@ -145,7 +145,7 @@ AddFilesToHaikuImage beos system add-ons kernel bus_managers
 AddFilesToHaikuImage beos system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
 AddFilesToHaikuImage beos system add-ons kernel busses ide
-	: generic_ide_pci silicon_image_3112 legacy_sata ; #$(X86_ONLY)ide_isa ;
+	: generic_ide_pci silicon_image_3112 legacy_sata $(X86_ONLY)ide_isa ;
 AddFilesToHaikuImage beos system add-ons kernel busses scsi
 	: ahci ;
 AddFilesToHaikuImage beos system add-ons kernel busses usb
@@ -359,7 +359,7 @@ AddBootModuleSymlinksToHaikuImage
 	pci $(X86_ONLY)isa config_manager ide scsi
 	$(PPC_ONLY)openpic
 	block_io ide_adapter locked_pool scsi_periph
-	generic_ide_pci ahci legacy_sata silicon_image_3112 # $(X86_ONLY)ide_isa
+	generic_ide_pci ahci legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa
 	scsi_cd scsi_disk
 	intel
 	bfs

src/add-ons/kernel/busses/ide/generic_ide_pci/generic_ide_pci.c

@@ -3,11 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
-/*
+/*!	Generic PCI bus mastering IDE driver. */
-	Generic IDE PCI controller driver
-
-	Generic PCI bus mastering IDE driver.
-*/
 
 #include <KernelExport.h>
 #include <stdlib.h>
@@ -15,14 +11,6 @@
 
 #include <ide_adapter.h>
 
-#define debug_level_flow 0
-#define debug_level_error 3
-#define debug_level_info 3
-
-#define DEBUG_MSG_PREFIX "GENERIC IDE PCI -- "
-
-#include "wrapper.h"
-
 #define GENERIC_IDE_PCI_CONTROLLER_MODULE_NAME "busses/ide/generic_ide_pci/driver_v1"
 #define GENERIC_IDE_PCI_CHANNEL_MODULE_NAME "busses/ide/generic_ide_pci/channel/v1"
 
@@ -186,20 +174,6 @@ supports_device(device_node *parent)
 }
 
 
-static status_t
-module_std_ops(int32 op, ...)
-{
-	switch (op) {
-		case B_MODULE_INIT:
-		case B_MODULE_UNINIT:
-			return B_OK;
-
-		default:
-			return B_ERROR;
-	}
-}
-
-
 module_dependency module_dependencies[] = {
 	{ IDE_FOR_CONTROLLER_MODULE_NAME, (module_info **)&ide },
 	{ B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&pnp },
@@ -214,12 +188,12 @@ static ide_controller_interface channel_interface = {
 		{
 			GENERIC_IDE_PCI_CHANNEL_MODULE_NAME,
 			0,
-			module_std_ops
+			NULL
 		},
 
 		NULL,	// supports device
 		NULL,	// register device
-		(status_t (*)(device_node *, void **))init_channel,
+		init_channel,
 		uninit_channel,
 		NULL,	// register child devices
 		NULL,	// rescan
@@ -247,7 +221,7 @@ static driver_module_info controller_interface = {
 	{
 		GENERIC_IDE_PCI_CONTROLLER_MODULE_NAME,
 		0,
-		module_std_ops
+		NULL
 	},
 
 	supports_device,

src/add-ons/kernel/busses/ide/generic_ide_pci/wrapper.h

@@ -1,90 +0,0 @@
-#ifndef _WRAPPER_H
-#define _WRAPPER_H
-
-#include <KernelExport.h>
-#include <lock.h>
-
-
-// benaphores
-
-#define INIT_BEN(x, prefix)	(mutex_init_etc(x, prefix, MUTEX_FLAG_CLONE_NAME), \
-								B_OK)
-#define	DELETE_BEN(x)		mutex_destroy(x)
-#define ACQUIRE_BEN(x)		mutex_lock(x)
-#define RELEASE_BEN(x)		mutex_unlock(x)
-
-// debug output
-
-#ifdef DEBUG_WAIT_ON_MSG
-#	define DEBUG_WAIT snooze( DEBUG_WAIT_ON_MSG );
-#else
-#	define DEBUG_WAIT 
-#endif
-
-#ifdef DEBUG_WAIT_ON_ERROR
-#	define DEBUG_WAIT_ERROR snooze( DEBUG_WAIT_ON_ERROR );
-#else
-#	define DEBUG_WAIT_ERROR
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_FLOW
-#	define DEBUG_MAX_LEVEL_FLOW 4
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_INFO
-#	define DEBUG_MAX_LEVEL_INFO 4
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_ERROR
-#	define DEBUG_MAX_LEVEL_ERROR 4
-#endif
-
-#ifndef DEBUG_MSG_PREFIX
-#	define DEBUG_MSG_PREFIX ""
-#endif
-
-#ifndef debug_level_flow
-#	define debug_level_flow 3
-#endif
-
-#ifndef debug_level_info
-#	define debug_level_info 2
-#endif
-
-#ifndef debug_level_error
-#	define debug_level_error 1
-#endif
-
-#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": "
-
-#define SHOW_FLOW(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_FLOW0(seriousness, format) \
-	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_INFO(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_INFO0(seriousness, format) \
-	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_ERROR(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \
-	}} while( 0 )
-
-#define SHOW_ERROR0(seriousness, format) \
-	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \
-	}} while( 0 )
-
-#endif	/* _BENAPHORE_H */

src/add-ons/kernel/busses/ide/ide_isa/ide_isa.c

@@ -22,17 +22,16 @@
 #include <device_manager.h>
 #include <block_io.h>
 
-#define debug_level_flow 0
-#define debug_level_error 1
-#define debug_level_info 2
 
-#define DEBUG_MSG_PREFIX "IDE ISA -- "
+//#define TRACE_IDE_ISA
-#define TRACE dprintf
+#ifdef TRACE_IDE_ISA
-
+#	define TRACE(x...) dprintf("ide_isa: " x)
-#include "wrapper.h"
+#else
+#	define TRACE(x...) ;
+#endif
 
 
-#define IDE_ISA_MODULE_NAME "busses/ide/ide_isa/device_v1"
+#define IDE_ISA_MODULE_NAME "busses/ide/ide_isa/driver_v1"
 
 // private node item:
 // io address of command block
@@ -42,7 +41,7 @@
 // interrupt number
 #define IDE_ISA_INTNUM "ide_isa/irq"
 
-//isa2_module_info *isa;
+
 ide_for_controller_interface *ide;
 device_manager_info *pnp;
 
@@ -58,12 +57,63 @@ typedef struct channel_info {
 							// be accessed anymore
 
 	ide_channel ide_channel;
-	device_node_handle	node;
+	device_node *node;
 } channel_info;
 
 
+/*! publish node of an ide channel */
 static status_t
-write_command_block_regs(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask)
+publish_channel(device_node *parent, uint16 command_block_base,
+	uint16 control_block_base, uint8 intnum, const char *name)
+{
+	device_attr attrs[] = {
+		{ B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { string: IDE_FOR_CONTROLLER_MODULE_NAME }},
+
+		// properties of this controller for ide bus manager
+		{ IDE_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { ui8: 2 }},
+		{ IDE_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: 0 }},
+		{ IDE_CONTROLLER_CAN_CQ_ITEM, B_UINT8_TYPE, { ui8: 1 }},
+		{ IDE_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { string: name }},
+
+		// DMA properties; the 16 bit alignment is not necessary as
+		// the ide bus manager handles that very efficiently, but why
+		// not use the block device manager for doing that?
+		{ B_BLOCK_DEVICE_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 1 }},
+
+		// private data to identify device
+		{ IDE_ISA_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { ui16: command_block_base }},
+		{ IDE_ISA_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { ui16: control_block_base }},
+		{ IDE_ISA_INTNUM, B_UINT8_TYPE, { ui8: intnum }},
+		{ NULL }
+	};
+	io_resource resources[3] = {
+		{ B_IO_PORT, command_block_base, 8 },
+		{ B_IO_PORT, control_block_base, 1 },
+		{}
+	};
+
+	TRACE("publishing %s, resources %#x %#x %d\n",
+		  name, command_block_base, control_block_base, intnum);
+
+	return pnp->register_node(parent, IDE_ISA_MODULE_NAME, attrs, resources,
+		NULL);
+}
+
+
+//	#pragma mark -
+
+
+static void
+set_channel(void *cookie, ide_channel ideChannel)
+{
+	channel_info *channel = cookie;
+	channel->ide_channel = ideChannel;
+}
+
+
+static status_t
+write_command_block_regs(void *channel_cookie, ide_task_file *tf,
+	ide_reg_mask mask)
 {
 	channel_info *channel = channel_cookie;
 	uint16 ioaddr = channel->command_block_base;
@@ -74,12 +124,13 @@ write_command_block_regs(void *channel_cookie, ide_task_file *tf, ide_reg_mask m
 
 	for (i = 0; i < 7; i++) {
 		if (((1 << (i-7)) & mask) != 0) {
-			SHOW_FLOW(3, "%x->HI(%x)", tf->raw.r[i + 7], i);
+			TRACE("write_command_block_regs(): %x->HI(%x)\n",
+				tf->raw.r[i + 7], i);
 			channel->isa->write_io_8(ioaddr + 1 + i, tf->raw.r[i + 7]);
 		}
 
 		if (((1 << i) & mask) != 0 ) {
-			SHOW_FLOW(3, "%x->LO(%x)", tf->raw.r[i], i);
+			TRACE("write_comamnd_block_regs(): %x->LO(%x)\n", tf->raw.r[i], i);
 			channel->isa->write_io_8(ioaddr + 1 + i, tf->raw.r[i]);
 		}
 	}
@@ -89,7 +140,8 @@ write_command_block_regs(void *channel_cookie, ide_task_file *tf, ide_reg_mask m
 
 
 static status_t
-read_command_block_regs(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask)
+read_command_block_regs(void *channel_cookie, ide_task_file *tf,
+	ide_reg_mask mask)
 {
 	channel_info *channel = channel_cookie;
 	uint16 ioaddr = channel->command_block_base;
@@ -101,7 +153,7 @@ read_command_block_regs(void *channel_cookie, ide_task_file *tf, ide_reg_mask ma
 	for (i = 0; i < 7; i++) {
 		if (((1 << i) & mask) != 0) {
 			tf->raw.r[i] = channel->isa->read_io_8(ioaddr + 1 + i);
-			SHOW_FLOW(3, "%x: %x", i, (int)tf->raw.r[i]);
+			TRACE("read_command_block_regs(%x): %x\n", i, (int)tf->raw.r[i]);
 		}
 	}
 
@@ -128,7 +180,7 @@ write_device_control(void *channel_cookie, uint8 val)
 	channel_info *channel = channel_cookie;
 	uint16 device_control_addr = channel->control_block_base;
 
-	SHOW_FLOW(3, "%x", (int)val);
+	TRACE("write_device_control(%x)\n", (int)val);
 
 	if (channel->lost)
 		return B_ERROR;
@@ -197,7 +249,7 @@ inthand(void *arg)
 	channel_info *channel = (channel_info *)arg;
 	uint8 status;
 
-	SHOW_FLOW0(3, "");
+	TRACE("interrupt handler()\n");
 
 	if (channel->lost)
 		return B_UNHANDLED_INTERRUPT;
@@ -210,9 +262,8 @@ inthand(void *arg)
 
 
 static status_t
-prepare_dma(void *channel_cookie, 
+prepare_dma(void *channel_cookie, const physical_entry *sg_list,
-	const physical_entry *sg_list, size_t sg_list_count,
+	size_t sg_list_count, bool write)
-	bool write)
 {
 	return B_NOT_ALLOWED;
 }
@@ -232,33 +283,35 @@ finish_dma(void *channel_cookie)
 }
 
 
+//	#pragma mark -
+
+
 static float
-supports_device(device_node_handle parent, bool *_noConnection)
+supports_device(device_node *parent)
 {
-	char *bus;
+	const char *bus;
 
 	// make sure parent is really the ISA bus manager
-	if (pnp->get_attr_string(parent, B_DRIVER_BUS, &bus, false))
+	if (pnp->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
 		return B_ERROR;
 
-	if (strcmp(bus, "isa")) {
+	if (strcmp(bus, "isa"))
-		free(bus);
 		return 0.0;
-	}
 
-	// ToDo: check I/O resources for availability?
+	// we assume that every modern PC has an IDE controller, so no
+	// further testing is done (well - I don't really know how to detect the
+	// controller, but who cares ;)
 
-	free(bus);
 	return 0.6;
 }
 
 
 static status_t
-init_channel(device_node_handle node, ide_channel ide_channel, channel_info **cookie)
+init_channel(device_node *node, void **_cookie)
 {
 	channel_info *channel;
+	device_node *parent;
 	isa2_module_info *isa;
-	void *dummy;
 	uint16 command_block_base, control_block_base;
 	uint8 irq;
 	status_t res;
@@ -271,14 +324,13 @@ init_channel(device_node_handle node, ide_channel ide_channel, channel_info **co
 		|| pnp->get_attr_uint8(node, IDE_ISA_INTNUM, &irq, false) != B_OK)
 		return B_ERROR;
 
-	if (pnp->init_driver(pnp->get_parent(node), NULL, (driver_module_info **)&isa, &dummy) != B_OK)
+	parent = pnp->get_parent_node(node);
-		return B_ERROR;
+	pnp->get_driver(parent, (driver_module_info **)&isa, NULL);
+	pnp->put_node(parent);
 
 	channel = (channel_info *)malloc(sizeof(channel_info));
-	if (channel == NULL) {
+	if (channel == NULL)
-		res = B_NO_MEMORY;
+		return B_NO_MEMORY;
-		goto err0;
-	}
 
 	TRACE("ISA-IDE: channel init, resources %#x %#x %d\n",
 		  command_block_base, control_block_base, irq);
@@ -289,7 +341,7 @@ init_channel(device_node_handle node, ide_channel ide_channel, channel_info **co
 	channel->command_block_base = command_block_base;
 	channel->control_block_base = control_block_base;
 	channel->intnum = irq;
-	channel->ide_channel = ide_channel;
+	channel->ide_channel = NULL;
 
 	res = install_io_interrupt_handler(channel->intnum,
 		inthand, channel, 0);
@@ -302,20 +354,16 @@ init_channel(device_node_handle node, ide_channel ide_channel, channel_info **co
 	// enable interrupts so the channel is ready to run
 	write_device_control(channel, ide_devctrl_bit3);
 
-	*cookie = channel;
+	*_cookie = channel;
-
 	return B_OK;
 
 err:
 	free(channel);
-	
-err0:
-	pnp->uninit_driver(pnp->get_parent(node));
 	return res;
 }
 
 
-static status_t
+static void
 uninit_channel(void *channel_cookie)
 {
 	channel_info *channel = channel_cookie;
@@ -332,136 +380,39 @@ uninit_channel(void *channel_cookie)
 
 	remove_io_interrupt_handler(channel->intnum, inthand, channel);
 
-	pnp->uninit_driver(pnp->get_parent(channel->node));
-
 	free(channel);
-
-	return B_OK;
-}
-
-
-/** publish node of an ide channel */
-
-static status_t
-publish_channel(device_node_handle parent, io_resource_handle *resources, 
-	uint16 command_block_base, uint16 control_block_base, uint8 intnum, 
-	const char *name)
-{
-	device_attr attrs[] = {
-		// info about ourself and our consumer
-		{ B_DRIVER_MODULE, B_STRING_TYPE, { string: IDE_ISA_MODULE_NAME }},
-		{ B_DRIVER_FIXED_CHILD, B_STRING_TYPE, { string: IDE_FOR_CONTROLLER_MODULE_NAME }},
-		{ PNP_DRIVER_CONNECTION, B_STRING_TYPE, { string: name }},
-
-		// properties of this controller for ide bus manager
-		{ IDE_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { ui8: 2 }},
-		{ IDE_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: 0 }},
-		{ IDE_CONTROLLER_CAN_CQ_ITEM, B_UINT8_TYPE, { ui8: 1 }},
-		{ IDE_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { string: name }},
-
-		// DMA properties; the 16 bit alignment is not necessary as 
-		// the ide bus manager handles that very efficiently, but why 
-		// not use the block device manager for doing that?
-		{ B_BLOCK_DEVICE_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 1 }},
-
-		// private data to identify device
-		{ IDE_ISA_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { ui16: command_block_base }},
-		{ IDE_ISA_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { ui16: control_block_base }},
-		{ IDE_ISA_INTNUM, B_UINT8_TYPE, { ui8: intnum }},
-		{ NULL }
-	};
-	device_node_handle node;
-
-	SHOW_FLOW0(2, "");
-
-	TRACE("ISA-IDE: publishing %s, resources %#x %#x %d\n",
-		  name, command_block_base, control_block_base, intnum);
-
-	return pnp->register_device(parent, attrs, resources, &node);
-}
-
-
-// detect IDE channel
-static status_t
-probe_channel(device_node_handle parent,
-	uint16 command_block_base, uint16 control_block_base, 
-	int intnum, const char *name)
-{
-	io_resource resources[3] = {
-		{ IO_PORT, command_block_base, 8 },
-		{ IO_PORT, control_block_base, 1 },
-		{}
-	};
-	io_resource_handle resource_handles[3];
-
-	SHOW_FLOW(3, "name = \"%s\"", name);
-
-	// we aren't upset if io-ports are in use already - only 
-	// the PCI IDE driver can own them, and if it does, we exit silently
-	if (pnp->acquire_io_resources(resources, resource_handles) != B_OK) {
-		TRACE("ISA-IDE: can't acquire resources %#x and %#x\n",
-			  command_block_base, control_block_base);
-		return B_OK;
-	}
-
-	// we assume that every modern PC has an IDE controller, so no
-	// further testing is done (well - I don't really know how to detect the
-	// controller, but who cares ;)	
-	return publish_channel(parent, resource_handles, command_block_base,
-		control_block_base, intnum, name);
 }
 
 
 static status_t
-register_device(device_node_handle node)
+register_device(device_node *parent)
 {
-	SHOW_FLOW0(3, "");
+	status_t primaryStatus;
+	status_t secondaryStatus;
+	TRACE("register_device()\n");
 
 	// our parent device is the isa bus and all device drivers are Universal,
 	// so the pnp_manager tries each ISA driver in turn
-	probe_channel(node, 0x1f0, 0x3f6, 14, "primary IDE channel");
+	primaryStatus = publish_channel(parent, 0x1f0, 0x3f6, 14,
-	probe_channel(node, 0x170, 0x376, 15, "secondary IDE channel");
+		"primary IDE channel");
+	secondaryStatus = publish_channel(parent, 0x170, 0x376, 15,
+		"secondary IDE channel");
 
-	return B_OK;
+	if (primaryStatus == B_OK || secondaryStatus == B_OK)
+		return B_OK;
+
+	return primaryStatus;
 }
 
 
 static void
-channel_removed(device_node_handle node, void *channel_cookie)
+channel_removed(void *cookie)
 {
-	channel_info *channel = channel_cookie;
+	channel_info *channel = cookie;
-	SHOW_FLOW0(3, "");
+	TRACE("channel_removed()\n");
 
-	if (channel != NULL)
+	// disable access instantly
-		// disable access instantly
+	atomic_or(&channel->lost, 1);
-		atomic_or(&channel->lost, 1);
-
-	return;
-}
-
-
-static void
-get_paths(const char ***_bus, const char ***_device)
-{
-	static const char *kBus[] = {"isa", NULL};
-	static const char *kDevice[] = {"drivers/dev/disk/ide", NULL};
-
-	*_bus = kBus;
-	*_device = kDevice;
-}
-
-
-static status_t
-std_ops(int32 op, ...)
-{
-	switch (op) {
-		case B_MODULE_INIT:
-		case B_MODULE_UNINIT:
-			return B_OK;
-
-		default:
-			return B_ERROR;
-	}
 }
 
 
@@ -472,23 +423,25 @@ module_dependency module_dependencies[] = {
 };
 
 // exported interface
-ide_controller_interface isa_controller_interface = {
+static ide_controller_interface sISAControllerInterface = {
 	{
 		{
 			IDE_ISA_MODULE_NAME,
 			0,
-			std_ops
+			NULL
 		},
 
 		supports_device,
 		register_device,
-		(status_t (*)(device_node_handle, void *, void **))	init_channel,
+		init_channel,
 		uninit_channel,
+		NULL,	// register child devices
+		NULL,	// rescan
 		channel_removed,
-		NULL,		// cleanup
-		get_paths
 	},
 
+	&set_channel,
+
 	&write_command_block_regs,
 	&read_command_block_regs,
 
@@ -504,6 +457,6 @@ ide_controller_interface isa_controller_interface = {
 };
 
 module_info *modules[] = {
-	(module_info *)&isa_controller_interface,
+	(module_info *)&sISAControllerInterface,
 	NULL
 };

src/add-ons/kernel/busses/ide/ide_isa/wrapper.h

@@ -1,90 +0,0 @@
-#ifndef _WRAPPER_H
-#define _WRAPPER_H
-
-#include <KernelExport.h>
-#include <lock.h>
-
-
-// benaphores
-
-#define INIT_BEN(x, prefix)	(mutex_init_etc(x, prefix, MUTEX_FLAG_CLONE_NAME), \
-								B_OK)
-#define	DELETE_BEN(x)		mutex_destroy(x)
-#define ACQUIRE_BEN(x)		mutex_lock(x)
-#define RELEASE_BEN(x)		mutex_unlock(x)
-
-// debug output
-
-#ifdef DEBUG_WAIT_ON_MSG
-#	define DEBUG_WAIT snooze( DEBUG_WAIT_ON_MSG );
-#else
-#	define DEBUG_WAIT 
-#endif
-
-#ifdef DEBUG_WAIT_ON_ERROR
-#	define DEBUG_WAIT_ERROR snooze( DEBUG_WAIT_ON_ERROR );
-#else
-#	define DEBUG_WAIT_ERROR
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_FLOW
-#	define DEBUG_MAX_LEVEL_FLOW 4
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_INFO
-#	define DEBUG_MAX_LEVEL_INFO 4
-#endif
-
-#ifndef DEBUG_MAX_LEVEL_ERROR
-#	define DEBUG_MAX_LEVEL_ERROR 4
-#endif
-
-#ifndef DEBUG_MSG_PREFIX
-#	define DEBUG_MSG_PREFIX ""
-#endif
-
-#ifndef debug_level_flow
-#	define debug_level_flow 1
-#endif
-
-#ifndef debug_level_info
-#	define debug_level_info 2
-#endif
-
-#ifndef debug_level_error
-#	define debug_level_error 3
-#endif
-
-#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__
-
-#define SHOW_FLOW(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_FLOW0(seriousness, format) \
-	do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_INFO(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_INFO0(seriousness, format) \
-	do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \
-	}} while( 0 )
-
-#define SHOW_ERROR(seriousness, format, param...) \
-	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \
-	}} while( 0 )
-
-#define SHOW_ERROR0(seriousness, format) \
-	do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \
-		dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \
-	}} while( 0 )
-
-#endif	/* _BENAPHORE_H */