Changeset 71 in projects

Timestamp:

Mar 30, 2013, 3:01:08 PM (10 years ago)

Author:

sven

Message:

Bugfix for faulty NL to CRNL conversion at binary jones output

Location:

punch-card-project/trunk/driver/documation-m200/src

Files:

• protocol.c (modified) (2 diffs)
• protocol.h (modified) (1 diff)

punch-card-project/trunk/driver/documation-m200/src/protocol.c

@@ -49 +49 @@
 
 // Haupt-Transmit-Routine, backend von stdio
+// Used for ordinary string output
+// Usage: fputc, fputs, putchar
 int uart_transmit_main(char c, FILE* stream) {
         if(c == '\n')
                 uart_transmit_main('\r', stream);
 
+        uart_transmit_binary(c);
+        return 0;
+}
+
+// Haupt-Transmit-Routine, binary backend von stdio-like
+// Usage: fputc(c, binary_main_thread);
+void uart_transmit_binary(char c) {
+        // only difference to uart_transmit_main: No "\n" => "\r\n" conversion since
+        // data is treated as binary
+        
         while (!(UCSR0A & 0b00100000));
         // PENDING: Hardware flow control
         UDR0 = c;
-        return 0;
 }
 
@@ -148 +159 @@
                                         odd_col = current_read_card.columns[x++];
 
-                                        putchar( even_col >> 4 ); // erstes byte
-                                        putchar( ((even_col & 017) << 4) | (odd_col >> 8) ); // zweites byte
-                                        putchar( odd_col & 00377 ); // drittes byte
+                                        // bypass stdout for avoiding EOL conversion
+                                        uart_transmit_binary( even_col >> 4 ); // erstes byte
+                                        uart_transmit_binary( ((even_col & 017) << 4) | (odd_col >> 8) ); // zweites byte
+                                        uart_transmit_binary( odd_col & 00377 ); // drittes byte
                                 }
                         }

punch-card-project/trunk/driver/documation-m200/src/protocol.h

@@ -45 +45 @@
 int uart_transmit(char c, FILE* stream);
 int uart_transmit_main(char c, FILE* stream);
+void uart_transmit_binary(char c);
 
 // A char value as return value from uart_recieve