Index: uspace/drv/audio/sb16/dsp.c
===================================================================
--- uspace/drv/audio/sb16/dsp.c	(revision 92b638c034f15cb008344be39773f82ec6481376)
+++ uspace/drv/audio/sb16/dsp.c	(revision 5eed99d1a7dac805e6bac75fe973588db97600c0)
@@ -81,5 +81,5 @@
 
 
-static inline void sb_dsp_change_state(sb_dsp_t *dsp, dsp_state_t state)
+static inline void dsp_change_state(sb_dsp_t *dsp, dsp_state_t state)
 {
 	assert(dsp);
@@ -89,5 +89,5 @@
 }
 
-static inline int sb_dsp_read(sb_dsp_t *dsp, uint8_t *data)
+static inline int dsp_read(sb_dsp_t *dsp, uint8_t *data)
 {
 	assert(data);
@@ -106,5 +106,5 @@
 }
 
-static inline int sb_dsp_write(sb_dsp_t *dsp, uint8_t data)
+static inline int dsp_write(sb_dsp_t *dsp, uint8_t data)
 {
 	assert(dsp);
@@ -122,5 +122,5 @@
 }
 
-static inline void sb_dsp_reset(sb_dsp_t *dsp)
+static inline void dsp_reset(sb_dsp_t *dsp)
 {
 	assert(dsp);
@@ -129,23 +129,33 @@
 	udelay(3); /* Keep reset for 3 us */
 	pio_write_8(&dsp->regs->dsp_reset, 0);
-}
-
-static inline void sb_dsp_start_active(sb_dsp_t *dsp, uint8_t command)
-{
-	sb_dsp_write(dsp, command);
-	sb_dsp_write(dsp, dsp->active.mode);
-	sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
-	sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
-}
-
-static inline void sb_dsp_set_sampling_rate(sb_dsp_t *dsp, unsigned rate)
-{
-	sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
-	sb_dsp_write(dsp, rate >> 8);
-	sb_dsp_write(dsp, rate & 0xff);
+	/* "DSP takes about 100 microseconds to initialize itself" */
+	udelay(100);
+}
+
+static inline void dsp_start_current_active(sb_dsp_t *dsp, uint8_t command)
+{
+	dsp_write(dsp, command);
+	dsp_write(dsp, dsp->active.mode);
+	dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
+	dsp_write(dsp, (dsp->active.samples - 1) >> 8);
+}
+
+static inline void dsp_set_sampling_rate(sb_dsp_t *dsp, unsigned rate)
+{
+	dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
+	dsp_write(dsp, rate >> 8);
+	dsp_write(dsp, rate & 0xff);
 	ddf_log_verbose("Sampling rate: %hhx:%hhx.", rate >> 8, rate & 0xff);
 }
 
-static inline int sb_setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
+static inline void dsp_report_event(sb_dsp_t *dsp, pcm_event_t event)
+{
+	assert(dsp);
+	if (!dsp->event_exchange)
+		ddf_log_warning("No one listening for event %u", event);
+	async_msg_1(dsp->event_exchange, event, dsp->active.frame_count);
+}
+
+static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
 {
 	async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
@@ -160,5 +170,5 @@
 }
 
-static inline int sb_setup_buffer(sb_dsp_t *dsp, size_t size)
+static inline int setup_buffer(sb_dsp_t *dsp, size_t size)
 {
 	assert(dsp);
@@ -177,5 +187,5 @@
 
 	/* Setup 16 bit channel */
-	ret = sb_setup_dma(dsp, (uintptr_t)pa, size);
+	ret = setup_dma(dsp, (uintptr_t)pa, size);
 	if (ret == EOK) {
 		dsp->buffer.data = buffer;
@@ -189,12 +199,4 @@
 }
 
-static inline void dsp_report_event(sb_dsp_t *dsp, pcm_event_t event)
-{
-	assert(dsp);
-	if (!dsp->event_exchange)
-		ddf_log_warning("No one listening for event %u", event);
-	async_msg_1(dsp->event_exchange, event, dsp->active.frame_count);
-}
-
 static inline size_t sample_count(pcm_sample_format_t format, size_t byte_count)
 {
@@ -213,9 +215,7 @@
 	dsp->sb_dev = dev;
 	dsp->state = DSP_NO_BUFFER;
-	sb_dsp_reset(dsp);
-	/* "DSP takes about 100 microseconds to initialize itself" */
-	udelay(100);
+	dsp_reset(dsp);
 	uint8_t response;
-	const int ret = sb_dsp_read(dsp, &response);
+	const int ret = dsp_read(dsp, &response);
 	if (ret != EOK) {
 		ddf_log_error("Failed to read DSP reset response value.");
@@ -228,7 +228,7 @@
 
 	/* Get DSP version number */
-	sb_dsp_write(dsp, DSP_VERSION);
-	sb_dsp_read(dsp, &dsp->version.major);
-	sb_dsp_read(dsp, &dsp->version.minor);
+	dsp_write(dsp, DSP_VERSION);
+	dsp_read(dsp, &dsp->version.major);
+	dsp_read(dsp, &dsp->version.minor);
 
 	return ret;
@@ -248,5 +248,5 @@
 	case DSP_PLAYBACK_NOEVENTS:
 #ifndef AUTO_DMA_MODE
-	sb_dsp_start_active(dsp, SINGLE_DMA_16B_DA);
+	dsp_start_current_active(dsp, SINGLE_DMA_16B_DA);
 #endif
 		break;
@@ -255,5 +255,5 @@
 	case DSP_CAPTURE_NOEVENTS:
 #ifndef AUTO_DMA_MODE
-	sb_dsp_start_active(dsp, SINGLE_DMA_16B_DA);
+	dsp_start_current_active(dsp, SINGLE_DMA_16B_DA);
 #endif
 		break;
@@ -262,5 +262,5 @@
 		async_exchange_end(dsp->event_exchange);
 		dsp->event_exchange = NULL;
-		sb_dsp_change_state(dsp, DSP_STOPPED);
+		dsp_change_state(dsp, DSP_STOPPED);
 		break;
 	case DSP_PLAYBACK_TERMINATE:
@@ -268,5 +268,5 @@
 		async_exchange_end(dsp->event_exchange);
 		dsp->event_exchange = NULL;
-		sb_dsp_change_state(dsp, DSP_STOPPED);
+		dsp_change_state(dsp, DSP_STOPPED);
 		break;
 	default:
@@ -367,5 +367,5 @@
 	assert(dsp->buffer.data == NULL);
 
-	const int ret = sb_setup_buffer(dsp, *size);
+	const int ret = setup_buffer(dsp, *size);
 	if (ret == EOK) {
 		ddf_log_debug("Providing buffer: %p, %zu B.",
@@ -376,5 +376,5 @@
 		if (size)
 			*size = dsp->buffer.size;
-		sb_dsp_change_state(dsp, DSP_READY);
+		dsp_change_state(dsp, DSP_READY);
 	}
 	return ret;
@@ -391,5 +391,5 @@
 	dsp->buffer.size = 0;
 	ddf_log_debug("DSP buffer released.");
-	sb_dsp_change_state(dsp, DSP_NO_BUFFER);
+	dsp_change_state(dsp, DSP_NO_BUFFER);
 	return EOK;
 }
@@ -427,10 +427,10 @@
 	dsp->active.frame_count = 0;
 
-	sb_dsp_set_sampling_rate(dsp, sampling_rate);
+	dsp_set_sampling_rate(dsp, sampling_rate);
 
 #ifdef AUTO_DMA_MODE
-	sb_dsp_start_active(dsp, AUTO_DMA_16B_DA_FIFO);
+	dsp_start_current_active(dsp, AUTO_DMA_16B_DA_FIFO);
 #else
-	sb_dsp_start_active(dsp, SINGLE_DMA_16B_DA);
+	dsp_start_current_active(dsp, SINGLE_DMA_16B_DA);
 #endif
 
@@ -439,5 +439,5 @@
 	    sampling_rate / (dsp->active.samples * channels));
 
-	sb_dsp_change_state(dsp,
+	dsp_change_state(dsp,
 	    frames ? DSP_PLAYBACK_ACTIVE_EVENTS : DSP_PLAYBACK_NOEVENTS);
 	if (dsp->state == DSP_PLAYBACK_ACTIVE_EVENTS)
@@ -454,8 +454,8 @@
 	    immediate)
 	{
-		sb_dsp_write(dsp, DMA_16B_PAUSE);
-		sb_dsp_reset(dsp);
+		dsp_write(dsp, DMA_16B_PAUSE);
+		dsp_reset(dsp);
 		ddf_log_debug("Stopped playback");
-		sb_dsp_change_state(dsp, DSP_STOPPED);
+		dsp_change_state(dsp, DSP_STOPPED);
 		return EOK;
 	}
@@ -464,7 +464,7 @@
 		/* Stop after current fragment */
 		assert(!immediate);
-		sb_dsp_write(dsp, DMA_16B_EXIT);
+		dsp_write(dsp, DMA_16B_EXIT);
 		ddf_log_debug("Last playback fragment");
-		sb_dsp_change_state(dsp, DSP_PLAYBACK_TERMINATE);
+		dsp_change_state(dsp, DSP_PLAYBACK_TERMINATE);
 		return EOK;
 	}
@@ -502,10 +502,10 @@
 	dsp->active.frame_count = 0;
 
-	sb_dsp_set_sampling_rate(dsp, sampling_rate);
+	dsp_set_sampling_rate(dsp, sampling_rate);
 
 #ifdef AUTO_DMA_MODE
-	sb_dsp_start_active(dsp, AUTO_DMA_16B_AD_FIFO);
+	dsp_start_current_active(dsp, AUTO_DMA_16B_AD_FIFO);
 #else
-	sb_dsp_start_active(dsp, SINGLE_DMA_16B_AD);
+	dsp_start_current_active(dsp, SINGLE_DMA_16B_AD);
 #endif
 
@@ -513,5 +513,5 @@
 	    "(~1/%u sec)", dsp->active.samples,
 	    sampling_rate / (dsp->active.samples * channels));
-	sb_dsp_change_state(dsp,
+	dsp_change_state(dsp,
 	    frames ? DSP_CAPTURE_ACTIVE_EVENTS : DSP_CAPTURE_NOEVENTS);
 	if (dsp->state == DSP_CAPTURE_ACTIVE_EVENTS)
@@ -527,8 +527,8 @@
 	    immediate)
 	{
-		sb_dsp_write(dsp, DMA_16B_PAUSE);
-		sb_dsp_reset(dsp);
+		dsp_write(dsp, DMA_16B_PAUSE);
+		dsp_reset(dsp);
 		ddf_log_debug("Stopped capture fragment");
-		sb_dsp_change_state(dsp, DSP_STOPPED);
+		dsp_change_state(dsp, DSP_STOPPED);
 		return EOK;
 	}
@@ -537,7 +537,7 @@
 		/* Stop after current fragment */
 		assert(!immediate);
-		sb_dsp_write(dsp, DMA_16B_EXIT);
+		dsp_write(dsp, DMA_16B_EXIT);
 		ddf_log_debug("Last capture fragment");
-		sb_dsp_change_state(dsp, DSP_CAPTURE_TERMINATE);
+		dsp_change_state(dsp, DSP_CAPTURE_TERMINATE);
 		return EOK;
 	}