merge alice to bob

1 files changed, 19 insertions, 5 deletions

diff --git a/pipe_image.c b/pipe_image.c
index 987ae99..7e27fb9 100644
--- a/pipe_image.c
+++ b/pipe_image.c
@@ -15,7 +15,7 @@
 int main(int argc, const char **argv) {
   const char *image_file_name = "kernel.img";
   _Bool stdout_instead_of_uart = 0;
-  
+
   if (argc > 1)
     if (!strcmp(argv[1], "--stdout"))
       {
@@ -50,7 +50,7 @@ int main(int argc, const char **argv) {
   const int comport=16;
 
   if (!stdout_instead_of_uart)
-    if (RS232_OpenComport(comport, 115200, "8N1", 0) == 1)
+    if (RS232_OpenComport(comport, 115200, "8N1", 1) == 1)
       err(-1, "Error opening comport");
 
   uint32_t image_size_le = htole32(image_size);
@@ -63,7 +63,7 @@ int main(int argc, const char **argv) {
   else
     {
       if (RS232_SendBuf(comport, (unsigned char*) &image_size_le, 4)
-	  == 1)
+	  == -1)
 	err(-1, "error writing number to serial");
     }
 
@@ -84,13 +84,27 @@ int main(int argc, const char **argv) {
 	}
       else
 	{
-	  if (RS232_SendBuf(comport, buf, bytes_read) == 1)
+	  if (RS232_SendBuf(comport, buf, bytes_read) == -1)
 	    err(-1, "error writing to serial");
 	}
 
       bytes_left -= bytes_read;
     }
-
+/*
+  while(1){
+      int bytes_read=read(0,buf,sizeof(buf));
+      if (stdout_instead_of_uart)
+	{
+	  if (fwrite((unsigned char*) buf, bytes_read, 1, stdout) != 1)
+	    err(-1, "error writing to stdout");
+	}
+      else
+	{
+	  if (RS232_SendBuf(comport, buf, bytes_read) == 1)
+	    err(-1, "error writing to serial");
+	}
+  }
+  */
   if (!stdout_instead_of_uart)
     RS232_CloseComport(comport);