Subject: port-sparc/1410: minor tweaks to sparc/sparc/autoconf.c
To: None <gnats-bugs@gnats.netbsd.org>
From: None <mrg@eterna.com.au>
List: netbsd-bugs
Date: 08/27/1995 20:43:42
>Number:         1410
>Category:       port-sparc
>Synopsis:       minor tweaks to sparc/sparc/autoconf.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 27 06:50:02 1995
>Last-Modified:
>Originator:     matthew green
>Organization:
bozotic softwar foundation
>Release:        950824
>Environment:
System: NetBSD splode.eterna.com.au 1.0A NetBSD 1.0A (_splode_) #245: Sat Aug 26 02:04:52 EST 1995 mrg@splode.eterna.com.au:/orb/q/build/src/sys/arch/sparc/compile/_splode_ sparc


>Description:

	the patch below does the following:
		fix a spelling error in a comment,
		put a bit of sun4 only code undef #if defined(SUN4), and,
		change a u_long to a dev_t (as directed in comment).
	
>How-To-Repeat:
>Fix:

Index: autoconf.c
===================================================================
RCS file: /local/cvs/src/sys/arch/sparc/sparc/autoconf.c,v
retrieving revision 1.1.1.10
diff -c -r1.1.1.10 autoconf.c
*** autoconf.c	1995/08/25 13:42:55	1.1.1.10
--- autoconf.c	1995/08/27 10:39:38
***************
*** 184,190 ****
  		/*
  		 * XXX:
  		 * The promvec is bogus. We need to build a
! 		 * fake one from scrath as soon as possible.
  		 */
  		bzero(&promvecdat, sizeof promvecdat);
  		promvec = &promvecdat;
--- 184,190 ----
  		/*
  		 * XXX:
  		 * The promvec is bogus. We need to build a
! 		 * fake one from scratch as soon as possible.
  		 */
  		bzero(&promvecdat, sizeof promvecdat);
  		promvec = &promvecdat;
***************
*** 913,918 ****
--- 913,919 ----
  	 * EEPROM contains the Ethernet address for the LANCE chip.
  	 * If the device cannot be located or configured, panic.
  	 */
+ #if defined(SUN4)
  	if (cputyp == CPU_SUN4) {
  
  		/* Start at the beginning of the bootpath */
***************
*** 928,934 ****
  			oca.ca_ra.ra_name = sp;
  			(void)config_found(dev, (void *)&oca, mbprint);
  		}
! 	} else {
  
  		/* remember which frame buffer, if any, is to be /dev/fb */
  		fbnode = getpropint(node, "fb", 0);
--- 929,937 ----
  			oca.ca_ra.ra_name = sp;
  			(void)config_found(dev, (void *)&oca, mbprint);
  		}
! 	} else
! #endif
! 	{
  
  		/* remember which frame buffer, if any, is to be /dev/fb */
  		fbnode = getpropint(node, "fb", 0);
***************
*** 1345,1351 ****
  	dumpconf();
  }
  
! u_long	bootdev;		/* should be dev_t, but not until 32 bits */
  
  #define	PARTITIONMASK	0x7
  #define	PARTITIONSHIFT	3
--- 1348,1354 ----
  	dumpconf();
  }
  
! dev_t	bootdev;
  
  #define	PARTITIONMASK	0x7
  #define	PARTITIONSHIFT	3
>Audit-Trail:
>Unformatted: