From 18f7cd3325418585c1d32426456379356247226d Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 20 Jul 2009 14:12:05 +0000
Subject: [PATCH] Ensure control pipe is selected in the PrinterHost demo
 before trying to send control requests.

---
 Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c | 6 ++++++
 Demos/Host/LowLevel/PrinterHost/PrinterHost.c         | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
index 6ed7fa9086..4c88bb4f26 100644
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -82,6 +82,8 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
 			wIndex:        0,
 			wLength:       sizeof(DeviceIDStringLength),
 		};
+		
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
 
 	if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)
 	  return ErrorCode;
@@ -122,6 +124,8 @@ uint8_t Printer_GetPortStatus(uint8_t* PortStatus)
 			wLength:       sizeof(uint8_t),
 		};
 
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+
 	return USB_Host_SendControlRequest(PortStatus);
 }
 
@@ -141,6 +145,8 @@ uint8_t Printer_SoftReset(void)
 			wLength:       0,
 		};
 
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+
 	return USB_Host_SendControlRequest(NULL);
 }
 
diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index 64adf22c79..5623dc7e7e 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -226,8 +226,7 @@ void USB_Printer_Host(void)
 		
 			Printer_Data_t TestPageData =
 				{
-//					"\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X",
-					"\033@\033i\001\033X\001\060\000\r\nLUFA ESCP/2 Test Page\r\n",
+					"\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X",
 					(sizeof(TestPageData.Data) - 1)
 				};