--- trunk/src/devices/dev_turbochannel.c	2007/10/08 16:18:00	4
+++ trunk/src/devices/dev_turbochannel.c	2007/10/08 16:19:23	20
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_turbochannel.c,v 1.40 2005/02/18 06:19:19 debug Exp $
+ *  $Id: dev_turbochannel.c,v 1.45 2005/11/13 00:14:10 debug Exp $
  *  
  *  Generic framework for TURBOchannel devices, used in DECstation machines.
  */
@@ -41,6 +41,10 @@
 #include "sfbreg.h"
 
 
+#define	DEVICE_NAME_BUFLEN		9
+#define	CARD_NAME_BUFLEN		9
+#define	CARD_FIRMWARE_BUFLEN		5
+
 struct turbochannel_data {
 	int		slot_nr;
 	uint64_t	baseaddr;
@@ -49,13 +53,13 @@
 
 	int		rom_skip;
 
-	char		device_name[9];		/*  NUL-terminated  */
+	char		device_name[DEVICE_NAME_BUFLEN];  /*  NUL-terminated  */
 
 	/*  These should be terminated with spaces  */
-	char		card_firmware_version[8];
-	char		card_vendor_name[8];
-	char		card_module_name[8];
-	char		card_firmware_type[4];
+	char		card_firmware_version[CARD_NAME_BUFLEN];
+	char		card_vendor_name[CARD_NAME_BUFLEN];
+	char		card_module_name[CARD_NAME_BUFLEN];
+	char		card_firmware_type[CARD_FIRMWARE_BUFLEN];
 };
 
 
@@ -69,7 +73,8 @@
 	struct turbochannel_data *d = extra;
 	uint64_t idata = 0, odata = 0;
 
-	idata = memory_readmax64(cpu, data, len);
+	if (writeflag == MEM_WRITE)
+		idata = memory_readmax64(cpu, data, len);
 
 	relative_addr += d->rom_skip;
 
@@ -179,10 +184,9 @@
 {
 	struct vfb_data *fb;
 	struct turbochannel_data *d;
-	int rom_offset = 0x3c0000;
-	int rom_length = DEV_TURBOCHANNEL_LEN;
-	int rom_skip = 0;
+	int rom_offset=0x3c0000, rom_length=DEV_TURBOCHANNEL_LEN, rom_skip=0;
 	char *name2;
+	size_t nlen;
 
 	if (device_name == NULL)
 		return;
@@ -203,14 +207,14 @@
 	d->endaddr  = endaddr;
 	d->irq      = irq;
 
-	strcpy(d->device_name, device_name);
+	strlcpy(d->device_name, device_name, DEVICE_NAME_BUFLEN);
 
-	strncpy(d->card_firmware_version, "V5.3a   ", 8);
-	strncpy(d->card_vendor_name,      "DEC     ", 8);
-	strncpy(d->card_firmware_type,    "TCF0", 4);
+	strncpy(d->card_firmware_version, "V5.3a   ", CARD_NAME_BUFLEN);
+	strncpy(d->card_vendor_name,      "DEC     ", CARD_NAME_BUFLEN);
+	strncpy(d->card_firmware_type,    "TCF0", CARD_FIRMWARE_BUFLEN);
 
 	memset(d->card_module_name, ' ', 8);
-	strncpy(d->card_module_name, device_name, strlen(device_name));
+	memcpy(d->card_module_name, device_name, strlen(device_name));
 
 	/*
 	 *  According to NetBSD/pmax:
@@ -246,7 +250,7 @@
 	} else if (strcmp(device_name, "PMAG-AA")==0) {
 		/*  mfb in NetBSD  */
 		fb = dev_fb_init(machine, mem, baseaddr + VFB_MFB_VRAM,
-		    VFB_GENERIC, 1280, 1024, 2048, 1024, 8, device_name, 1);
+		    VFB_GENERIC, 1280, 1024, 2048, 1024, 8, device_name);
 		/*  bt455 = palette, bt431 = cursor  */
 		dev_bt455_init(mem, baseaddr + VFB_MFB_BT455, fb);
 		dev_bt431_init(mem, baseaddr + VFB_MFB_BT431, fb, 8);
@@ -254,7 +258,7 @@
 	} else if (strcmp(device_name, "PMAG-BA")==0) {
 		/*  cfb in NetBSD  */
 		fb = dev_fb_init(machine, mem, baseaddr, VFB_GENERIC,
-		    1024,864, 1024,1024,8, device_name, 1);
+		    1024,864, 1024,1024,8, device_name);
 		dev_bt459_init(machine, mem, baseaddr + VFB_CFB_BT459,
 		    baseaddr + 0x300000, fb, 8, irq, BT459_BA);
 		/*  ROM at both 0x380000 and 0x3c0000?  */
@@ -264,7 +268,7 @@
 		/*  sfb in NetBSD  */
 		/*  TODO: This is not working with Ultrix yet.  */
 		fb = dev_fb_init(machine, mem, baseaddr + SFB_OFFSET_VRAM,
-		    VFB_GENERIC, 1280,1024, 1280,1024,8, device_name, 1);
+		    VFB_GENERIC, 1280,1024, 1280,1024,8, device_name);
 		dev_sfb_init(machine, mem, baseaddr + SFB_ASIC_OFFSET, fb);
 		/*  TODO: the CLEAR doesn't get through, as the address
 			range is already in use by the asic  */
@@ -292,7 +296,7 @@
 	} else if (strcmp(device_name, "PMAG-DV")==0) {
 		/*  xcfb in NetBSD: TODO  */
 		fb = dev_fb_init(machine, mem, baseaddr + 0x2000000,
-		    VFB_DEC_MAXINE, 0, 0, 0, 0, 0, "PMAG-DV", 1);
+		    VFB_DEC_MAXINE, 0, 0, 0, 0, 0, "PMAG-DV");
 		/*  TODO:  not yet usable, needs a IMS332 vdac  */
 		rom_offset = 0x3c0000;
 	} else if (strcmp(device_name, "PMAG-JA")==0) {
@@ -302,7 +306,7 @@
 	} else if (strcmp(device_name, "PMAG-RO")==0) {
 		/*  This works at least B/W in Ultrix, so far.  */
 		fb = dev_fb_init(machine, mem, baseaddr + 0x200000,
-		    VFB_GENERIC, 1280,1024, 1280,1024, 8, "PMAG-RO", 1);
+		    VFB_GENERIC, 1280,1024, 1280,1024, 8, "PMAG-RO");
 		/*  TODO: bt463 at offset 0x040000, not bt459  */
 		dev_bt459_init(machine, mem, baseaddr + 0x40000, 0,
 		    fb, 8, irq, 0);		/*  TODO: type  */
@@ -320,17 +324,18 @@
 
 	d->rom_skip = rom_skip;
 
-	name2 = malloc(strlen(device_name) + 30);
+	nlen = strlen(device_name) + 30;
+	name2 = malloc(nlen);
 	if (name2 == NULL) {
 		fprintf(stderr, "out of memory in dev_turbochannel_init()\n");
 		exit(1);
 	}
 	if (*device_name)
-		sprintf(name2, "turbochannel [%s]", device_name);
+		snprintf(name2, nlen, "turbochannel [%s]", device_name);
 	else
-		sprintf(name2, "turbochannel");
+		snprintf(name2, nlen, "turbochannel");
 
 	memory_device_register(mem, name2, baseaddr + rom_offset + rom_skip,
-	    rom_length-rom_skip, dev_turbochannel_access, d, MEM_DEFAULT, NULL);
+	    rom_length-rom_skip, dev_turbochannel_access, d, DM_DEFAULT, NULL);
 }