fix different alignment problems

correct PDC/IODC call formats
factor some more code out to the dev_hppa.c routines
basically boot on many more machine by now

1 files changed, 14 insertions, 20 deletions

diff --git a/sys/arch/hppa/stand/libsa/machdep.c b/sys/arch/hppa/stand/libsa/machdep.c
index 6f0eccca0a3..79b285cee48 100644
--- a/sys/arch/hppa/stand/libsa/machdep.c
+++ b/sys/arch/hppa/stand/libsa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.3 1999/02/13 04:43:18 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.4 1999/04/20 20:01:02 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -53,38 +53,32 @@ machdep()
 
 #ifdef PDCDEBUG
 	if (debug) {
+		register int i;
+
 		printf("SSTOR:\n");
 		printf("pri_boot=");	DEVPATH_PRINT(&sstor.ss_pri_boot);
 		printf("alt_boot=");	DEVPATH_PRINT(&sstor.ss_alt_boot);
 		printf("console =");	DEVPATH_PRINT(&sstor.ss_console);
 		printf("keyboard=");	DEVPATH_PRINT(&sstor.ss_keyboard);
-		printf("mem=%d, fn=%s, osver=%d\n"
-		       "os={%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,\n"
-		           "%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x}\n",
+		printf("mem=%d, fn=%s, osver=%d\nos={",
 		       sstor.ss_fast_size, sstor.ss_filenames,
-		       sstor.ss_os_version,
-		       sstor.ss_os[0], sstor.ss_os[1], sstor.ss_os[2],
-		       sstor.ss_os[3], sstor.ss_os[4], sstor.ss_os[5],
-		       sstor.ss_os[6], sstor.ss_os[7], sstor.ss_os[8],
-		       sstor.ss_os[9], sstor.ss_os[10], sstor.ss_os[11],
-		       sstor.ss_os[12], sstor.ss_os[13], sstor.ss_os[14],
-		       sstor.ss_os[15], sstor.ss_os[16], sstor.ss_os[17],
-		       sstor.ss_os[18], sstor.ss_os[19], sstor.ss_os[20],
-		       sstor.ss_os[21]);
+		       sstor.ss_os_version);
+		for (i = 0; i < sizeof(sstor.ss_os); i++)
+			printf ("%x%c", sstor.ss_os[i], (i%8)? ',' : '\n');
 
-		printf("PAGE0:\n");
-		printf("ivec=%x, pf=%p[%u], toc=%p[%u], rendz=%p\n"
-		       "mem: cont=%u, phys=%u, pdc_spa=%u, resv=%u, free=%x\n"
-		       "cpu_hpa=%p, pdc=%p, imm_hpa=%p[%u,%u]\n"
-		       "soft=%u, tic/10ms=%u\n",
+		printf("}\nPAGE0:\n");
+		printf("ivec=%x, pf=%p[%u], toc=%p[%u], rndz=%p, clk/10ms=%u\n",
 		       PAGE0->ivec_special, PAGE0->ivec_mempf,
 		       PAGE0->ivec_mempflen, PAGE0->ivec_toc,
 		       PAGE0->ivec_toclen, PAGE0->ivec_rendz,
+		       PAGE0->mem_10msec);
+		printf ("mem: cont=%u, phys=%u, pdc_spa=%u, resv=%u, free=%x\n"
+			"cpu_hpa=%p, pdc=%p, imm_hpa=%p[%u,%u], soft=%u\n",
 		       PAGE0->memc_cont, PAGE0->memc_phsize, PAGE0->memc_adsize,
 		       PAGE0->memc_resv, PAGE0->mem_free, PAGE0->mem_hpa,
 		       PAGE0->mem_pdc, PAGE0->imm_hpa, PAGE0->imm_spa_size,
-		       PAGE0->imm_max_mem, PAGE0->imm_soft_boot,
-		       PAGE0->mem_10msec);
+		       PAGE0->imm_max_mem, PAGE0->imm_soft_boot);
+
 		printf("console:  ");	PZDEV_PRINT(&PAGE0->mem_cons);
 		printf("boot:     ");	PZDEV_PRINT(&PAGE0->mem_boot);
 		printf("keyboard: ");	PZDEV_PRINT(&PAGE0->mem_kbd);