Changeset 10910 for firmware/FSC/src/w5100_spi_interface.c

Timestamp:

06/05/11 17:40:00 (13 years ago)

Author:

neise

Message:

 

File:

• firmware/FSC/src/w5100_spi_interface.c (modified) (5 diffs)

firmware/FSC/src/w5100_spi_interface.c

@@ -8 +8 @@
 volatile U08 eth_write_buffer[ETH_WRITE_BUFFER_SIZE];
 
+U08 eth_write_index;
 //-----------------------------------------------------------------------------
 // INTERFACE CONTROL VARS
@@ -305 +306 @@
         {
                 return 0;
-        }
-        usart_write_str((U08*)"sending via eth: with pointer:");
-        usart_write_U16_hex(string);
-        usart_write_str((U08*)" #of bytes: ");
-        usart_write_U16(NumBytes,4 );
-        usart_write_char(' \n');
-        
+        }       
         U16 last_TX_write_pointer = get_S0_TX_WR();
         U16 offset = last_TX_write_pointer & S0_TX_MASK;
@@ -340 +335 @@
                 upper_size = (S0_RX_MASK + 1) - offset;
                 lower_size = NumBytes - upper_size;
-                for (U08 i = 0; i < upper_size; ++i)
+                for (U16 i = 0; i < upper_size; ++i)
                 {
                         w5100_write(start_address + i, string[i]);
                 }
-                for (U08 i = 0; i < lower_size; ++i)
+                for (U16 i = 0; i < lower_size; ++i)
                 {
                         w5100_write(S0_RX_BASE + i, string[upper_size+i]);
@@ -351 +346 @@
         else // if not data turn over in RX-mem
         {
-                for (U08 i = 0; i < NumBytes; ++i)
+                for (U16 i = 0; i < NumBytes; ++i)
                 {
                         w5100_write(start_address + i, string[i]);
@@ -366 +361 @@
 }
 
+void eth_write_str( U08* str ){
+
+        while (*str) {
+                if (eth_write_index < ETH_WRITE_BUFFER_SIZE) {
+                        eth_write_buffer[eth_write_index++] = *str++;
+                }
+                
+        }
+        w5100_set_TX(eth_write_buffer, eth_write_index);
+        eth_write_index = 0;
+}
+
+void eth_writeln_str( U08* str ){
+
+        while (*str) 
+        {
+                if (eth_write_index < ETH_WRITE_BUFFER_SIZE) {
+                        eth_write_buffer[eth_write_index++] = *str++;
+                }
+        }
+        if (eth_write_index < ETH_WRITE_BUFFER_SIZE) {
+                eth_write_buffer[eth_write_index++] = '\n';
+        }
+        w5100_set_TX(eth_write_buffer, eth_write_index);
+        eth_write_index = 0;
+}
+