Index: uspace/drv/bus/usb/usbdiag/tests.c
===================================================================
--- uspace/drv/bus/usb/usbdiag/tests.c	(revision bf0398cead0d24521491c0d54ad56710a7cc1786)
+++ uspace/drv/bus/usb/usbdiag/tests.c	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -49,5 +49,5 @@
 		return EBADMEM;
 
-	char *buffer = (char *) malloc(size);
+	char *buffer = usb_pipe_alloc_buffer(pipe, size);
 	if (!buffer)
 		return ENOMEM;
@@ -67,5 +67,5 @@
 
 		while (remaining > 0) {
-			if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
+			if ((rc = usb_pipe_read_dma(pipe, buffer + size - remaining, remaining, &transferred))) {
 				usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
 				break;
@@ -92,5 +92,5 @@
 	usb_log_info("Burst test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
-	free(buffer);
+	usb_pipe_free_buffer(pipe, buffer);
 	if (duration)
 		*duration = in_duration;
@@ -104,5 +104,5 @@
 		return EBADMEM;
 
-	char *buffer = (char *) malloc(size);
+	char *buffer = usb_pipe_alloc_buffer(pipe, size);
 	if (!buffer)
 		return ENOMEM;
@@ -120,5 +120,5 @@
 	for (int i = 0; i < cycles; ++i) {
 		// Write buffer to device.
-		if ((rc = usb_pipe_write(pipe, buffer, size))) {
+		if ((rc = usb_pipe_write_dma(pipe, buffer, size))) {
 			usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
 			break;
@@ -133,5 +133,5 @@
 	usb_log_info("Burst test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
-	free(buffer);
+	usb_pipe_free_buffer(pipe, buffer);
 	if (duration)
 		*duration = in_duration;
@@ -152,5 +152,5 @@
 		return EINVAL;
 
-	char *buffer = (char *) malloc(size);
+	char *buffer = usb_pipe_alloc_buffer(pipe, size);
 	if (!buffer)
 		return ENOMEM;
@@ -170,5 +170,5 @@
 
 		while (remaining > 0) {
-			if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) {
+			if ((rc = usb_pipe_read_dma(pipe, buffer + size - remaining, remaining, &transferred))) {
 				usb_log_error("Read of %s IN endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
 				break;
@@ -208,5 +208,5 @@
 	usb_log_info("Data test on %s IN endpoint completed in %lu ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
-	free(buffer);
+	usb_pipe_free_buffer(pipe, buffer);
 	if (duration)
 		*duration = in_duration;
@@ -225,5 +225,5 @@
 		return EINVAL;
 
-	char *buffer = (char *) malloc(size);
+	char *buffer = usb_pipe_alloc_buffer(pipe, size);
 	if (!buffer)
 		return ENOMEM;
@@ -243,5 +243,5 @@
 	for (int i = 0; i < cycles; ++i) {
 		// Write buffer to device.
-		if ((rc = usb_pipe_write(pipe, buffer, size))) {
+		if ((rc = usb_pipe_write_dma(pipe, buffer, size))) {
 			usb_log_error("Write to %s OUT endpoint failed with error: %s", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc));
 			break;
@@ -256,5 +256,5 @@
 	usb_log_info("Data test on %s OUT endpoint completed in %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), in_duration);
 
-	free(buffer);
+	usb_pipe_free_buffer(pipe, buffer);
 	if (duration)
 		*duration = in_duration;