r1741 - in trunk

[dslinux_amadeus at dslinux.in-berlin.de]

Author: amadeus
Date: 2007-04-21 18:48:47 +0200 (Sat, 21 Apr 2007)
New Revision: 1741

Log:
making pepsiman happy ;-)

Modified: trunk/linux-2.6.x/drivers/block/dldi_c.c
===================================================================
--- trunk/linux-2.6.x/drivers/block/dldi_c.c	2007-04-21 14:54:10 UTC (rev 1740)
+++ trunk/linux-2.6.x/drivers/block/dldi_c.c	2007-04-21 16:48:47 UTC (rev 1741)
@@ -72,8 +72,8 @@
 
 #define BUF_SIZE	2048
 
-/* This is the major number of /dev/hda */
-static int dldi_major = 3;
+/* This is the major number of /dev/dldi */
+static int dldi_major = 240;
 
 /* We don't know how big the medium is. So we take some big number, */
 static int nsectors   = (2*1024*1024*2);	/* 2 GBytes */

Modified: trunk/vendors/Nintendo/DLDI/Makefile
===================================================================
--- trunk/vendors/Nintendo/DLDI/Makefile	2007-04-21 14:54:10 UTC (rev 1740)
+++ trunk/vendors/Nintendo/DLDI/Makefile	2007-04-21 16:48:47 UTC (rev 1741)
@@ -16,10 +16,13 @@
 DEVICES = \
 	tty,c,5,0      console,c,5,1      cua0,c,5,64      cua1,c,5,65  \
 	\
-	mem,c,1,1      kmem,c,1,2         null,c,1,3       ram0,b,1,0 \
-	ram1,b,1,1     hda,b,3,0          hda1,b,3,1 \
-	hda2,b,3,2     hda3,b,3,3         hda4,b,3,4 \
+	mem,c,1,1      kmem,c,1,2         null,c,1,3 \
 	\
+	ram0,b,1,0     ram1,b,1,1 \
+	\
+	dldi,b,240,0 \
+	dldi1,b,240,1  dldi2,b,240,2      dldi3,b,240,3    dldi4,b,240,4 \
+	\
 	ptyp0,c,2,0    ptyp1,c,2,1        ptyp2,c,2,2      ptyp3,c,2,3 \
 	ptyp4,c,2,4    ptyp5,c,2,5        ptyp6,c,2,6      ptyp7,c,2,7 \
 	ptyp8,c,2,8    ptyp9,c,2,9        ptypa,c,2,10     ptypb,c,2,11 \

Modified: trunk/vendors/Nintendo/DLDI/rc
===================================================================
--- trunk/vendors/Nintendo/DLDI/rc	2007-04-21 14:54:10 UTC (rev 1740)
+++ trunk/vendors/Nintendo/DLDI/rc	2007-04-21 16:48:47 UTC (rev 1741)
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 mount -t proc none /proc
-mount -t vfat -o noatime /dev/hda1 /media
+mount -t vfat -o noatime /dev/dldi1 /media
 # some CF cards do not have a partition table
-# try mounting /dev/hda if mounting /dev/hda1 fails
+# try mounting /dev/dldi if mounting /dev/dldi1 fails
 if [ "$?" != "0" ]
 then
-	mount -t vfat -o noatime /dev/hda /media
+	mount -t vfat -o noatime /dev/dldi /media
 	[ "$?" = "0" ] || echo "Sorry, failed to mount DLDI device."
 fi
 mount -t ramfs none /var/run