diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/ichaudio.c b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/ichaudio.c
index d01f47359e..6d7494bc36 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/ichaudio.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/ichaudio.c
@@ -1,5 +1,6 @@
 #include "lala/lala.h"
 #include "ichaudio.h"
+#include "io.h"
 
 status_t ichaudio_attach(audio_drv_t *drv);
 status_t ichaudio_powerctl(audio_drv_t *drv);
@@ -28,12 +29,12 @@ id_table_t ichaudio_id_table[] = {
 
 
 driver_info_t driver_info = {
-	ichaudio_id_table,
-	"audio/lala/ichaudio",
-	sizeof(ichaudio_cookie),
-	ichaudio_attach,
-	ichaudio_detach,
-	ichaudio_powerctl,
+	.table			= ichaudio_id_table,
+	.basename		= "audio/lala/ichaudio",
+	.cookie_size	= sizeof(ichaudio_cookie),
+	.attach			= ichaudio_attach,
+	.detach			= ichaudio_detach,
+	.powerctl		= ichaudio_powerctl,
 };
 
 
@@ -42,6 +43,9 @@ ichaudio_attach(audio_drv_t *drv)
 {
 	ichaudio_cookie *cookie = (ichaudio_cookie *)drv->cookie;
 	uint32 value;
+	int i;
+	bigtime_t start;
+	bool s0cr, s1cr, s2cr;
 	
 	dprintf("ichaudio_attach\n");
 
@@ -76,10 +80,125 @@ ichaudio_attach(audio_drv_t *drv)
 		cookie->nambar = PCI_address_io_mask & drv->pci->read_pci_config(drv->bus, drv->device, drv->function, 0x10, 4);
 		cookie->nabmbar = PCI_address_io_mask & drv->pci->read_pci_config(drv->bus, drv->device, drv->function, 0x14, 4);
 		if (!cookie->nambar || !cookie->nabmbar) {
-			dprintf("ichaudio_attach: io unconfiugured\n");
+			dprintf("ichaudio_attach: io unconfigured\n");
 			goto err;			
 		}
 	}
+	
+	/* We don't do a cold reset here, because this would reset general purpose
+	 * IO pins of the controller. These pins can be used by the machine vendor
+	 * to control external amplifiers, and resetting them prevents audio output
+	 * on some notebooks, like "Compaq Presario 2700".
+	 * If a cold reset is still in progress, we need to finish it by writing
+	 * a 1 to the cold reset bit (CNT_COLD). We do not preserve others bits,
+	 * since this can have strange effects (at least on my system, playback
+	 * speed is 320% in this case).
+	 * Doing a warm reset it required to leave certain power down modes. Warm
+	 * reset does also reset GPIO pins, but the ICH hardware does only execute
+	 * the reset request if BIT_CLOCK is not running and if it's really required.
+	 */
+	LOG(("reset starting, ICH_REG_GLOB_CNT = 0x%08x\n", ich_reg_read_32(drv, ICH_REG_GLOB_CNT)));
+	DEBUG_ONLY(start = system_time());
+	// finish cold reset by writing a 1 and clear all other bits to 0
+	ich_reg_write_32(drv, ICH_REG_GLOB_CNT, CNT_COLD);
+	ich_reg_read_32(drv, ICH_REG_GLOB_CNT); // force PCI-to-PCI bridge cache flush
+	snooze(20000);
+	// request warm reset by setting the bit, it will clear when reset is done
+	ich_reg_write_32(drv, ICH_REG_GLOB_CNT, ich_reg_read_32(drv, ICH_REG_GLOB_CNT) | CNT_WARM);
+	ich_reg_read_32(drv, ICH_REG_GLOB_CNT); // force PCI-to-PCI bridge cache flush
+	snooze(20000);
+	// wait up to 1 second for warm reset to be finished
+	for (i = 0; i < 20; i++) {
+		value = ich_reg_read_32(drv, ICH_REG_GLOB_CNT);
+		if ((value & CNT_WARM) == 0 && (value & CNT_COLD) != 0)
+			break;
+		snooze(50000);
+	}
+	if (i == 20) {
+		LOG(("reset failed, ICH_REG_GLOB_CNT = 0x%08x\n", value));
+		goto err;
+	}
+	LOG(("reset finished after %Ld, ICH_REG_GLOB_CNT = 0x%08x\n", system_time() - start, value));
+
+	/* detect which codecs are ready */
+	s0cr = s1cr = s2cr = false;
+	start = system_time();
+	do {
+		value = ich_reg_read_32(drv, ICH_REG_GLOB_STA);
+		if (!s0cr && (value & STA_S0CR)) {
+			s0cr = true;
+			LOG(("AC_SDIN0 codec ready after %Ld us\n", system_time() - start));
+		}
+		if (!s1cr && (value & STA_S1CR)) {
+			s1cr = true;
+			LOG(("AC_SDIN1 codec ready after %Ld us\n", system_time() - start));
+		}
+		if (!s2cr && (value & STA_S2CR)) {
+			s2cr = true;
+			LOG(("AC_SDIN2 codec ready after %Ld us\n", system_time() - start));
+		}
+		snooze(50000);
+	} while ((system_time() - start) < 1000000);
+
+	if (!s0cr) {
+		LOG(("AC_SDIN0 codec not ready\n"));
+	}
+	if (!s1cr) {
+		LOG(("AC_SDIN1 codec not ready\n"));
+	}
+	if (!s2cr) {
+		LOG(("AC_SDIN2 codec not ready\n"));
+	}
+
+	if (!s0cr && !s1cr && !s2cr) {
+		PRINT(("compatible chipset found, but no codec ready!\n"));
+		goto err;
+	}
+	
+	if (drv->flags & TYPE_ICH4) {
+		/* we are using a ICH4 chipset, and assume that the codec beeing ready
+		 * is the primary one.
+		 */
+		uint8 sdin;
+		uint16 reset;
+		uint8 id;
+		reset = ich_codec_read(drv, 0x00);	/* access the primary codec */
+		if (reset == 0 || reset == 0xFFFF) {
+			LOG(("primary codec not present\n"));
+		} else {
+			sdin = 0x02 & ich_reg_read_8(drv, ICH_REG_SDM);
+			id = 0x02 & (ich_codec_read(drv, 0x00 + 0x28) >> 14);
+			LOG(("primary codec id %d is connected to AC_SDIN%d\n", id, sdin));
+		}
+		reset = ich_codec_read(drv, 0x80);	/* access the secondary codec */
+		if (reset == 0 || reset == 0xFFFF) {
+			LOG(("secondary codec not present\n"));
+		} else {
+			sdin = 0x02 & ich_reg_read_8(drv, ICH_REG_SDM);
+			id = 0x02 & (ich_codec_read(drv, 0x80 + 0x28) >> 14);
+			LOG(("secondary codec id %d is connected to AC_SDIN%d\n", id, sdin));
+		}
+		reset = ich_codec_read(drv, 0x100);	/* access the tertiary codec */
+		if (reset == 0 || reset == 0xFFFF) {
+			LOG(("tertiary codec not present\n"));
+		} else {
+			sdin = 0x02 & ich_reg_read_8(drv, ICH_REG_SDM);
+			id = 0x02 & (ich_codec_read(drv, 0x100 + 0x28) >> 14);
+			LOG(("tertiary codec id %d is connected to AC_SDIN%d\n", id, sdin));
+		}
+		
+		/* XXX this may be wrong */
+		ich_reg_write_8(drv, ICH_REG_SDM, (ich_reg_read_8(drv, ICH_REG_SDM) & 0x0F) | 0x08 | 0x90);
+	} else {
+		/* we are using a pre-ICH4 chipset, that has a fixed mapping of
+		 * AC_SDIN0 = primary, AC_SDIN1 = secondary codec.
+		 */
+		if (!s0cr && s2cr) {
+			// is is unknown if this really works, perhaps we should better abort here
+			LOG(("primary codec doesn't seem to be available, using secondary!\n"));
+			cookie->codecoffset = 0x80;
+		}
+	}
 
 
 	return B_OK;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/lala.h b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/lala.h
index 77bc699f1e..b8d4eb5fd8 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/lala.h
+++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/lala.h
@@ -1,3 +1,6 @@
+#ifndef __LALA_H
+#define __LALA_H
+
 #include <KernelExport.h>
 #include <config_manager.h>
 #include <PCI.h>
@@ -36,22 +39,78 @@ typedef struct {
 	uint32	flags;
 } id_table_t;
 
+
 typedef status_t (*drv_attach)		(audio_drv_t *drv);
 typedef status_t (*drv_powerctl)	(audio_drv_t *drv);
 typedef status_t (*drv_detach)		(audio_drv_t *drv);
 
+
 typedef struct 
 {
 	id_table_t *	table;
 	const char *	basename;
 	size_t			cookie_size;
+
+	uint32			_reserved1[16];
+
 	drv_attach		attach;
 	drv_detach		detach;
 	drv_powerctl	powerctl;
+
+	uint32			_reserved2[16];
 } driver_info_t;
 
+
+typedef struct {
+	char *	base;		/* pointer to first sample for channel for buffer */
+	size_t	stride;		/* offset to next sample */
+	uint32	_reserved[4];
+} stream_buffer_desc_t;
+
+
+typedef struct {
+	uint32	frame_rate;
+	uint32	buffer_size;
+	uint32	_reserved[16];
+} stream_config_t;
+
+
+typedef status_t (*stream_attach)			(audio_drv_t *drv, void *stream_cookie);
+typedef status_t (*stream_detach)			(audio_drv_t *drv, void *stream_cookie);
+typedef status_t (*stream_control)			(audio_drv_t *drv, void *stream_cookie, int op);
+typedef status_t (*stream_get_buffer_info)	(audio_drv_t *drv, void *stream_cookie, stream_buffer_desc_t *desc);
+typedef status_t (*stream_set_config)		(audio_drv_t *drv, void *stream_cookie, stream_config_t *config);
+
+
 typedef struct
 {
+	uint32	flags;
+	uint32	cookie_size;
+	uint32	user_param;
+	uint32	user_cookie;
+	uint32	sample_bits;
+	uint32	sample_flags;
+	uint32	channel_count;
+	uint32	channel_flags;
+	uint32	frame_rate_min;
+	uint32	frame_rate_max;
+	uint32	frame_rate_flags;
+	uint32	buffer_size_min;
+	uint32	buffer_size_max;
+	uint32	buffer_size_flags;
+	
+	uint32	_reserved1[32];
+
+	stream_attach			attach;
+	stream_detach			detach;
+	stream_control			control;
+	
+	stream_get_buffer_info	get_buffer_info;
+
+	stream_set_config		set_config;
+
+	uint32					_reserved2[16];
+	
 } stream_info_t;
 
 extern driver_info_t driver_info;
@@ -60,13 +119,17 @@ extern driver_info_t driver_info;
 area_id		alloc_mem(void **virt, void **phy, size_t size, uint32 protection, const char *name);
 area_id		map_mem(void **virt, void *phy, size_t size, uint32 protection, const char *name);
 
-stream_id	create_stream(audio_drv_t *dev, stream_info_t *info);
-status_t	control_stream(audio_drv_t *dev, stream_info_t *info);
+stream_id	create_stream(audio_drv_t *dev, stream_info_t *info, void *config);
 status_t	delete_stream(stream_id stream);
 
+void		report_stream_event(stream_id stream, int );
+
+
 control_id	create_control_group(control_id parent, audio_drv_t *dev);
 control_id	create_control(control_id parent, uint32 flags, void *get, void *set, const char *name);
 
 
 #define LOG(a)		dprintf a
 #define PRINT(a)	dprintf a
+
+#endif