- Added Serial Number as the basis for a MAC Address

- Removed the fixed buffer address (no longer needed for debugging)

Author: Ronnie Beck

source/device.c

@@ -293,32 +293,27 @@ ASM SAVEDS LONG DevOpen( ASMR(a1) struct IOSana2Req *ioreq           ASMREG(a1),
 		        char macAddress[6] = { 0x06,0x80,0x11,0x01,0x02,0x03};
 		        UWORD *lastTwoOctets = &macAddress[4];
 		        *lastTwoOctets = RangeRand( 0xffff );
-//		        STRPTR iconName = "v4net.device";
-//		        struct DiskObject *diskObject = GetDiskObject( iconName );
-//		        if( diskObject )
-//		        {
-//		        	STRPTR macString = FindToolType( diskObject->do_ToolTypes, (STRPTR)"mac" );
-//					if( macString )
-//					{
-//						D(( "[OpenDev] Mac address: %s\n", macString ));
-//						//struct Library *SysBase = SysBase;
-//						//sprintf( macString, "%x:%x:%x:%x:%x:%x", &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5] );
-//						//stringToMACAddress( macString, addr );
-//						//sscanf( macString, "%02X:%02X:%02X:%02X:%02X:%02X", &macAddress[0], &macAddress[1], &macAddress[2], &macAddress[3], &macAddress[4], &macAddress[5] );
-//					}
-//		        }
 		        hw_SetMacAddress( db, unit, macAddress );
 #else
 		        char MACAddressStr[32];
 		        LONG variableLength = GetVar( "V4NETMAC", MACAddressStr, sizeof( MACAddressStr ), GVF_GLOBAL_ONLY|GVF_LOCAL_ONLY );
-		        char macAddress[6] = { 0x06,0x80,0x11,0x01,0x02,0x03};
-		        if( variableLength == 2 )
-		        {
-		        	macParserLastOctet( macAddress, MACAddressStr, variableLength );
-		        }else if( variableLength == 17 )
-		        {
-		        	macParser( macAddress, MACAddressStr, variableLength );
-		        }
+		        char macAddress[6] = { 0x06,0x80,0x11,0x01,0x02,0x03 };
+
+		        //See if we have an FPGA-ID
+		        ULONG *SN_LO = 0x00DFF3F0;
+		        ULONG *SN_HI = 0x00DFF3F4;
+
+				if( variableLength == 2 )
+				{
+					macParserLastOctet( macAddress, MACAddressStr, variableLength );
+				}else if( variableLength == 17 )
+				{
+					macParser( macAddress, MACAddressStr, variableLength );
+				}else if( *SN_LO != 0 )
+				{
+					memcpy( &macAddress[ 2 ], SN_LO, 4 );
+				}
+
 		        hw_SetMacAddress( db, unit, macAddress );
 #endif
 

source/server.c

@@ -905,7 +905,7 @@ static LONG server_readqueue( DEVBASEP, ULONG unit)
 	LONG framesize;
 	LONG frametype;
 	LONG dropflag;
-	UBYTE maxReads = 10;
+	UBYTE maxReads = 5;
 	LONG returnCode = SERR_OK;
 
 	//Obtain the semaphore

source/v4net/hw.c

@@ -31,6 +31,10 @@ extern void KGetChar(void);
 #define VREG_BOARD_V1200 6
 #define VREG_BOARD_V4MC 7
 
+//Use this for debugging the DMA buffer
+//It will put the buffer at address 0x0f000000
+#define FIXED_BUFFER_ADDRESS 0
+
 #define V_V4NET 5
 #define PORTID V_V4NET	/* this is 5, update vampire/vampire.h if necessary */
 
@@ -170,18 +174,8 @@ ASM SAVEDS LONG hw_GetMacAddress( ASMR(a0) DEVBASEP                  ASMREG(a0),
 {
   UBYTE vsn[8];
   LONG i;
-#if 0
-  if( vampire_UUID( vsn ) > 0 )
-  {
-	for(i=0 ; i<3 ; i++ )
-	{
-		addr[3+i] = vsn[i] ^ vsn[i+5];
-	}
-  }
-#endif
   for( i=0 ; i<6 ; i++ )
   	mac[i] = addr[i];
-
   return 1;
 }
 
@@ -194,9 +188,18 @@ ASM SAVEDS LONG hw_SetMacAddress( ASMR(a0) DEVBASEP                  ASMREG(a0),
 {
   LONG i;
 
+#if 0
+  if( vampire_UUID( vsn ) > 0 )
+  {
+	for(i=0 ; i<3 ; i++ )
+	{
+		addr[3+i] = vsn[i] ^ vsn[i+5];
+	}
+  }
+#endif
+
   for( i=0 ; i<6 ; i++ )
   	addr[i] = mac[i];
-
   return 1;
 }
 
@@ -219,9 +222,12 @@ ASM SAVEDS LONG hw_Setup( ASMR(a0) DEVBASEP                  ASMREG(a0) )
 		ret = 1;
 	}
 
-	//hwd->hwd_mem = AllocVec( MEMSIZE + 2048, MEMF_FAST );
+#if FIXED_BUFFER_ADDRESS != 0
 	hwd->hwd_mem = AllocAbs( MEMSIZE*4, 0x0f000000 );
 	hwd->hwd_mem += MEMSIZE*2 + 2048;
+#else
+	hwd->hwd_mem = AllocVec( MEMSIZE + 2048, MEMF_FAST );
+#endif
 	if( hwd->hwd_mem )
 	{
 		ULONG aln = (ULONG)hwd->hwd_mem;
@@ -249,7 +255,11 @@ ASM SAVEDS void hw_Shutdown(  ASMR(a0) DEVBASEP                  ASMREG(a0) )
 
 	if( hwd->hwd_mem )
 	{
+#if FIXED_BUFFER_ADDRESS != 0
+		FreeMem( 0x0f000000, MEMSIZE*4 );
+#else
 		FreeVec( hwd->hwd_mem );
+#endif
 		hwd->hwd_mem = (0);
 	}
 

source/version.h

@@ -9,9 +9,9 @@
 #define _INC_VERSION_H
 
 #define DEVICEVERSION  2
-#define DEVICEREVISION 30
+#define DEVICEREVISION 34
 #define DEVICEEXTRA 0
 /* #define DEVICEEXTRA Beta */
-#define DEVICEDATE    5.11.2022
+#define DEVICEDATE    22.1.2023
 
 #endif