Thread: [cadcdev-svn-commits] SF.net SVN: cadcdev:[600] kos

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 600
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=600&view=rev
Author:   ljsebald
Date:     2008-07-25 06:09:39 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
- Add g2_memset_8 function.
- Handle misaligned outgoing packets in the bba driver.
- Pad small packets with NULL bytes, rather than whatever junk is in the bba's tx buffer.

Modified Paths:
--------------
    kos/doc/CHANGELOG
    kos/kernel/arch/dreamcast/hardware/g2bus.c
    kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c
    kos/kernel/arch/dreamcast/include/dc/g2bus.h

Modified: kos/doc/CHANGELOG
===================================================================

--- kos/doc/CHANGELOG	2008-06-23 23:42:13 UTC (rev 599)
+++ kos/doc/CHANGELOG	2008-07-25 06:09:39 UTC (rev 600)
@@ -157,6 +157,11 @@
 - *** Moved checking for free(NULL) up in code to avoid potential problems [HL]
 - DC  fs_ramdisk.c: Don't allow opening a file with O_DIR [CG]
 - *** Removed legacy libc and libm [HL]
+- DC  Handle potentially misaligned outgoing packets in the BBA driver [LS]
+- DC  Added g2_memset_8 function for doing a memset over G2 with locking [LS]
+- DC  If a packet is < 60 bytes, pad it with null bytes for clarity, rather than
+      just transmitting whatever random junk was in the transmit buffer from
+      previous sends [LS]
 
 KallistiOS version 1.2.0 -----------------------------------------------
 - DC  Fix to use DCARM7_CFLAGS when compiling ARM driver [Christian Groessler == CG]

Modified: kos/kernel/arch/dreamcast/hardware/g2bus.c
===================================================================
--- kos/kernel/arch/dreamcast/hardware/g2bus.c	2008-06-23 23:42:13 UTC (rev 599)
+++ kos/kernel/arch/dreamcast/hardware/g2bus.c	2008-07-25 06:09:39 UTC (rev 600)
@@ -201,6 +201,20 @@
 	G2_UNLOCK(old1, old2);
 }
 
+/* A memset-like function for G2 */
+void g2_memset_8(uint32 address, uint8 c, int amt) {
+	vuint8 * output = (vuint8 *)address;
+	int old1, old2;
+
+	G2_LOCK(old1, old2);
+
+	while (amt--) {
+		*output++ = c;
+	}
+
+	G2_UNLOCK(old1, old2);
+}
+
 /* When writing to the SPU RAM, this is required at least every 8 32-bit
    writes that you execute */
 void g2_fifo_wait() {

Modified: kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c
===================================================================
--- kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c	2008-06-23 23:42:13 UTC (rev 599)
+++ kos/kernel/arch/dreamcast/hardware/network/broadband_adapter.c	2008-07-25 06:09:39 UTC (rev 600)
@@ -4,7 +4,7 @@
 
    Copyright (C)2001,2003,2005 Dan Potter
    Copyright (C)2004 Vincent Penne
-   Copyright (C)2007 Lawrence Sebald
+   Copyright (C)2007, 2008 Lawrence Sebald
 
  */
 
@@ -647,12 +647,25 @@
 
 	//g2_write_block_8(pkt, txdesc[rtl.cur_tx], len);
 
-	/* VP : g2_write_block_32 works here, use it , it's faster ! */
-	g2_write_block_32((uint32 *) pkt, txdesc[rtl.cur_tx], (len + 3) >> 2);
+	/* Check alignment of the packet, if its 32-bit aligned, use
+	   g2_write_block_32, if its 16-bit aligned, use g2_write_block_16,
+	   otherwise, use g2_write_block_8. */
+	if(!((uint32)pkt & 0x03)) {
+		g2_write_block_32((uint32 *) pkt, txdesc[rtl.cur_tx], (len + 3) >> 2);
+	}
+	else if(!((uint32)pkt & 0x01)) {
+		g2_write_block_16((uint16 *) pkt, txdesc[rtl.cur_tx], (len + 1) >> 1);
+	}
+	else {
+		g2_write_block_8(pkt, txdesc[rtl.cur_tx], len);
+	}
 
-	/* All packets must be at least 60 bytes */
-	if (len < 60)
+	/* All packets must be at least 60 bytes, pad them with null bytes if
+	   they are not already of an appropriate size. */
+	if (len < 60) {
+		g2_memset_8(txdesc[rtl.cur_tx] + len, 0, 60 - len);
 		len = 60;
+	}
 
 	/* Transmit from the current TX buffer */
 	g2_write_32(NIC(RT_TXSTATUS0 + 4 * rtl.cur_tx), len);
@@ -988,20 +1001,20 @@
 
 /* Set ISP configuration from the flashrom, as long as we're configured staticly */
 static void bba_set_ispcfg() {
-    flashrom_ispcfg_t isp;
+	flashrom_ispcfg_t isp;
 
-    if(flashrom_get_ispcfg(&isp) == -1)
-        return;
+	if(flashrom_get_ispcfg(&isp) == -1)
+		return;
 
-    if(!isp.ip_valid)
-        return;
+	if(!isp.ip_valid)
+		return;
 
-    if(isp.method != FLASHROM_ISP_STATIC)
-        return;
+	if(isp.method != FLASHROM_ISP_STATIC)
+		return;
 
-    memcpy(bba_if.ip_addr, isp.ip, 4);
-    memcpy(bba_if.netmask, isp.nm, 4);
-    memcpy(bba_if.gateway, isp.gw, 4);
+	memcpy(bba_if.ip_addr, isp.ip, 4);
+	memcpy(bba_if.netmask, isp.nm, 4);
+	memcpy(bba_if.gateway, isp.gw, 4);
 }
 
 /* Initialize */
@@ -1040,8 +1053,8 @@
 	bba_if.if_rx_poll = bba_if_rx_poll;
 	bba_if.if_set_flags = bba_if_set_flags;
 
-    /* Attempt to set up our IP address et al from the flashrom */
-    bba_set_ispcfg();
+	/* Attempt to set up our IP address et al from the flashrom */
+	bba_set_ispcfg();
 
 #if 0
 	/* Try to detect/init us */

Modified: kos/kernel/arch/dreamcast/include/dc/g2bus.h
===================================================================
--- kos/kernel/arch/dreamcast/include/dc/g2bus.h	2008-06-23 23:42:13 UTC (rev 599)
+++ kos/kernel/arch/dreamcast/include/dc/g2bus.h	2008-07-25 06:09:39 UTC (rev 600)
@@ -93,6 +93,9 @@
 /* Write a block of 32-bit values to G2 */
 void g2_write_block_32(const uint32 * input, uint32 address, int amt);
 
+/* memset(), but for use on G2. */
+void g2_memset_8(uint32 address, uint8 c, int amt);
+
 /* When writing to the SPU RAM, this is required at least every 8 32-bit
    writes that you execute */
 void g2_fifo_wait();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


