Changeset 11696 for firmware/FSC

Timestamp:

07/29/11 10:24:23 (13 years ago)

Author:

neise

Message:

the changes we made with thomas B did not work. I have to find out why...
only crap is send away now.

Location:

firmware/FSC/src

Files:

• num_conversion.c (modified) (2 diffs)
• w5100_spi_interface.c (modified) (6 diffs)

firmware/FSC/src/num_conversion.c

@@ -19 +19 @@
 {
   U08 len = strlen((const char *)source_ptr);
-  pU08 dest_ptr = nc_format_buffer;
+  pU08 dest_ptr = (pU08)&nc_format_buffer;
 
   // Fillup loop
@@ -35 +35 @@
   *dest_ptr = 0; // Terminate format string
 
-  return nc_format_buffer;
+  return (pU08)&nc_format_buffer;
 }
 //-----------------------------------------------------------------------------

firmware/FSC/src/w5100_spi_interface.c

@@ -424 +424 @@
         
         // now calculate the offset address
-            // calculated according to W5100 datasheet page: 44
-            /*
-        if ((offset + NumBytes) > (S0_TX_MASK + 1) )  // if data is turned over in RX-mem
-        {
-                upper_size = (S0_TX_MASK + 1) - offset;
+        // calculated according to W5100 datasheet page: 44
+        if ((offset + NumBytes) > (S0_RX_MASK + 1) )  // if data is turned over in RX-mem
+        {
+                upper_size = (S0_RX_MASK + 1) - offset;
                 lower_size = NumBytes - upper_size;
                 for (U16 i = 0; i < upper_size; ++i)
@@ -442 +441 @@
                 for (U16 i = 0; i < lower_size; ++i)
                 {
-                        w5100_write(S0_TX_BASE + i, string[upper_size+i]);
+                        w5100_write(S0_RX_BASE + i, string[upper_size+i]);
                         //usart_write_str((pU08)"wr:");
                         //usart_write_U16_hex(S0_RX_BASE + i);
@@ -453 +452 @@
         else // if not data turn over in RX-mem
         {
-          */      for (U16 i = 0; i < NumBytes; ++i)
-                {
-                        w5100_write(S0_TX_BASE + (offset + i)&S0_TX_MASK, string[i]);
+                for (U16 i = 0; i < NumBytes; ++i)
+                {
+                        w5100_write(start_address + i, string[i]);
                         //usart_write_str((pU08)"wr:");
                         //usart_write_U16_hex(start_address + i);
@@ -463 +462 @@
 
                 }
-        //}
+        }
 
         // inform W5100 about how much data was written.
@@ -491 +490 @@
 void eth_write_str( U08* str ){
 
-        while (*str && eth_write_index < ETH_WRITE_BUFFER_SIZE)
-        {
-            eth_write_buffer[eth_write_index++] = *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);
@@ -501 +502 @@
 void eth_writeln_str( U08* str ){
 
-        while (*str && eth_write_index < ETH_WRITE_BUFFER_SIZE) 
-        {
-            eth_write_buffer[eth_write_index++] = *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) {