Update TFTP to use a struct buffer rather than a callback.

Add debug autocolourisation to TFTP.

1 files changed, 7 insertions, 9 deletions

diff --git a/src/tests/tftptest.c b/src/tests/tftptest.c
index e09ef585..2e558a35 100644
--- a/src/tests/tftptest.c
+++ b/src/tests/tftptest.c
@@ -5,25 +5,23 @@
 #include <gpxe/tftp.h>
 #include <gpxe/async.h>
 #include <gpxe/uaccess.h>
+#include <gpxe/buffer.h>
 #include "pxe.h"
 
-static void test_tftp_callback ( struct tftp_session *tftp, unsigned int block,
-				 void *data, size_t len ) {
-	unsigned long offset = ( ( block - 1 ) * tftp->blksize );
-	userptr_t pxe_buffer = real_to_user ( 0, 0x7c00 );
-
-	copy_to_user ( pxe_buffer, offset, data, len );
-}
-
 int test_tftp ( struct net_device *netdev, struct sockaddr_tcpip *target,
 		const char *filename ) {
 	struct tftp_session tftp;
+	struct buffer buffer;
 	int rc;
 
+	memset ( &buffer, 0, sizeof ( buffer ) );
+	buffer.addr = real_to_user ( 0, 0x7c00 );
+	buffer.len = ( 512 * 1024 - 0x7c00 );
+
 	memset ( &tftp, 0, sizeof ( tftp ) );
 	udp_connect ( &tftp.udp, target );
 	tftp.filename = filename;
-	tftp.callback = test_tftp_callback;
+	tftp.buffer = &buffer;
 
 	printf ( "Fetching \"%s\" via TFTP\n", filename );
 	if ( ( rc = async_wait ( tftp_get ( &tftp ) ) ) != 0 )