gwj / at91sam9263 · Commits

Commit c44644bb966bd0cf7e09d94b043814ea0740fe8f

Authored by bellard
1 parent ed910241

update (Blue Swirl) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1349 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 110 additions and 91 deletions
pc-bios/proll.elf
View file @c44644b
No preview for this file type
pc-bios/proll.patch
  View file @c44644b
1   -diff -ruN proll_18.orig/Makefile proll-patch7/Makefile
  1 +diff -ruN proll_18.orig/Makefile proll-patch8/Makefile
2 2 --- proll_18.orig/Makefile 2002-09-13 14:16:59.000000000 +0000
3   -+++ proll-patch7/Makefile 2004-11-13 15:50:49.000000000 +0000
  3 ++++ proll-patch8/Makefile 2004-11-13 15:50:49.000000000 +0000
4 4 @@ -4,6 +4,7 @@
5 5 make -C krups-ser all
6 6 make -C espresso all
... ... @@ -14,14 +14,14 @@ diff -ruN proll_18.orig/Makefile proll-patch7/Makefile
14 14 make -C espresso clean
15 15 make -C espresso-ser clean
16 16 + make -C qemu clean
17   -diff -ruN proll_18.orig/qemu/Makefile proll-patch7/qemu/Makefile
  17 +diff -ruN proll_18.orig/qemu/Makefile proll-patch8/qemu/Makefile
18 18 --- proll_18.orig/qemu/Makefile 1970-01-01 00:00:00.000000000 +0000
19   -+++ proll-patch7/qemu/Makefile 2005-03-02 16:41:50.000000000 +0000
  19 ++++ proll-patch8/qemu/Makefile 2005-03-02 16:41:50.000000000 +0000
20 20 @@ -0,0 +1,122 @@
21 21 +#
22 22 +# proll:
23 23 +# qemu/Makefile - make PROLL for QEMU
24   -+# $Id: proll.patch,v 1.3 2005-03-13 09:43:36 bellard Exp $
  24 ++# $Id: proll.patch,v 1.4 2005-04-06 20:45:26 bellard Exp $
25 25 +#
26 26 +# Copyright 1999 Pete Zaitcev
27 27 +# This is Free Software is licensed under terms of GNU General Public License.
... ... @@ -140,9 +140,9 @@ diff -ruN proll_18.orig/qemu/Makefile proll-patch7/qemu/Makefile
140 140 +
141 141 +proll.aout: $(PROLLEXE)
142 142 + $(ELFTOAOUT) -o proll.aout $(PROLLEXE)
143   -diff -ruN proll_18.orig/qemu/head.S proll-patch7/qemu/head.S
  143 +diff -ruN proll_18.orig/qemu/head.S proll-patch8/qemu/head.S
144 144 --- proll_18.orig/qemu/head.S 1970-01-01 00:00:00.000000000 +0000
145   -+++ proll-patch7/qemu/head.S 2005-03-02 15:30:47.000000000 +0000
  145 ++++ proll-patch8/qemu/head.S 2005-03-02 15:30:47.000000000 +0000
146 146 @@ -0,0 +1,539 @@
147 147 +/**
148 148 + ** Standalone startup code for Linux PROM emulator.
... ... @@ -150,7 +150,7 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch7/qemu/head.S
150 150 + ** This code is licensed under GNU General Public License.
151 151 + **/
152 152 +/*
153   -+ * $Id: proll.patch,v 1.3 2005-03-13 09:43:36 bellard Exp $
  153 ++ * $Id: proll.patch,v 1.4 2005-04-06 20:45:26 bellard Exp $
154 154 + */
155 155 +
156 156 +#include <psr.h>
... ... @@ -683,9 +683,9 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch7/qemu/head.S
683 683 +C_LABEL(ldb_bypass):
684 684 + retl
685 685 + lduba [%o0] ASI_M_BYPASS, %o0
686   -diff -ruN proll_18.orig/qemu/main.c proll-patch7/qemu/main.c
  686 +diff -ruN proll_18.orig/qemu/main.c proll-patch8/qemu/main.c
687 687 --- proll_18.orig/qemu/main.c 1970-01-01 00:00:00.000000000 +0000
688   -+++ proll-patch7/qemu/main.c 2005-03-02 20:08:23.000000000 +0000
  688 ++++ proll-patch8/qemu/main.c 2005-04-03 11:58:46.000000000 +0000
689 689 @@ -0,0 +1,173 @@
690 690 +/**
691 691 + ** Proll (PROM replacement)
... ... @@ -755,7 +755,7 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch7/qemu/main.c
755 755 + printk_fn = vcon_write;
756 756 + }
757 757 + else {
758   -+ vcon_zs_init(&dp0, 0x71100000);
  758 ++ vcon_zs_init(&dp0, 0x71100004);
759 759 + printk_fn = vcon_zs_write;
760 760 + }
761 761 +
... ... @@ -860,10 +860,10 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch7/qemu/main.c
860 860 + hw_idprom = va_prom;
861 861 +}
862 862 +
863   -diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
  863 +diff -ruN proll_18.orig/qemu/openprom.c proll-patch8/qemu/openprom.c
864 864 --- proll_18.orig/qemu/openprom.c 1970-01-01 00:00:00.000000000 +0000
865   -+++ proll-patch7/qemu/openprom.c 2005-03-02 20:09:57.000000000 +0000
866   -@@ -0,0 +1,646 @@
  865 ++++ proll-patch8/qemu/openprom.c 2005-04-06 16:53:31.000000000 +0000
  866 +@@ -0,0 +1,665 @@
867 867 +/*
868 868 + * PROM interface support
869 869 + * Copyright 1996 The Australian National University.
... ... @@ -1082,27 +1082,27 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1082 1082 + {NULL, NULL, -1}
1083 1083 +};
1084 1084 +
1085   -+static const int prop_zs_intr[] = { 12, 0x0 };
  1085 ++static const int prop_zs_intr[] = { 0x2c, 0x0 };
1086 1086 +static const int prop_zs_reg[] = {
1087 1087 + 0x0, 0x00000000, 0x00000008,
1088 1088 +};
1089   -+static const int prop_zs_addr = { 0x70000000 };
1090 1089 +static const int prop_zs_slave[] = { 1 };
  1090 ++static void *prop_zs_addr;
1091 1091 +static const struct property propv_obio_zs[] = {
1092 1092 + {"name", "zs", sizeof("zs")},
1093 1093 + {"reg", (char*)&prop_zs_reg[0], sizeof(prop_zs_reg) },
1094 1094 + {"slave", (char*)&prop_zs_slave[0], sizeof(prop_zs_slave) },
1095 1095 + {"device_type", "serial", sizeof("serial") },
1096 1096 + {"intr", (char*)&prop_zs_intr[0], sizeof(prop_zs_intr) },
1097   -+ // {"address", (char*)&prop_zs_addr, sizeof(prop_zs_addr) },
  1097 ++ {"address", (char*)&prop_zs_addr, sizeof(prop_zs_addr) },
1098 1098 + {NULL, NULL, -1}
1099 1099 +};
1100 1100 +
1101   -+static const int prop_zs1_intr[] = { 12, 0x0 };
  1101 ++static const int prop_zs1_intr[] = { 0x2c, 0x0 };
1102 1102 +static const int prop_zs1_reg[] = {
1103 1103 + 0x0, 0x00100000, 0x00000008,
1104 1104 +};
1105   -+static const int prop_zs1_addr = { 0x70100000 };
  1105 ++static void *prop_zs1_addr;
1106 1106 +static const int prop_zs1_slave[] = { 0 };
1107 1107 +static const struct property propv_obio_zs1[] = {
1108 1108 + {"name", "zs", sizeof("zs")},
... ... @@ -1110,7 +1110,7 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1110 1110 + {"slave", (char*)&prop_zs1_slave[0], sizeof(prop_zs1_slave) },
1111 1111 + {"device_type", "serial", sizeof("serial") },
1112 1112 + {"intr", (char*)&prop_zs1_intr[0], sizeof(prop_zs1_intr) },
1113   -+ // {"address", (char*)&prop_zs1_addr, sizeof(prop_zs1_addr) },
  1113 ++ {"address", (char*)&prop_zs1_addr, sizeof(prop_zs1_addr) },
1114 1114 + {NULL, NULL, -1}
1115 1115 +};
1116 1116 +
... ... @@ -1141,9 +1141,9 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1141 1141 +static const int prop_espdma_reg[] = {
1142 1142 + 0x4, 0x08400000, 0x00000010,
1143 1143 +};
1144   -+// Disabled, not implemented yet
  1144 ++
1145 1145 +static const struct property propv_sbus_espdma[] = {
1146   -+ {"name", "xxxespdma", sizeof("xxxespdma")},
  1146 ++ {"name", "espdma", sizeof("espdma")},
1147 1147 + {"reg", (char*)&prop_espdma_reg[0], sizeof(prop_espdma_reg) },
1148 1148 + {NULL, NULL, -1}
1149 1149 +};
... ... @@ -1202,6 +1202,20 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1202 1202 + {NULL, NULL, -1}
1203 1203 +};
1204 1204 +
  1205 ++static const struct property propv_options[] = {
  1206 ++ {"name", "options", sizeof("options")},
  1207 ++ {"screen-#columns", "80", sizeof("80")},
  1208 ++ {"screen-#rows", "25", sizeof("25")},
  1209 ++ {"tpe-link-test?", "true", sizeof("true")},
  1210 ++ {"ttya-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
  1211 ++ {"ttya-ignore-cd", "true", sizeof("true")},
  1212 ++ {"ttya-rts-dtr-off", "false", sizeof("false")},
  1213 ++ {"ttyb-mode", "9600,8,n,1,-", sizeof("9600,8,n,1,-")},
  1214 ++ {"ttyb-ignore-cd", "true", sizeof("true")},
  1215 ++ {"ttyb-rts-dtr-off", "false", sizeof("false")},
  1216 ++ {NULL, NULL, -1}
  1217 ++};
  1218 ++
1205 1219 +static const struct node nodes[] = {
1206 1220 + { &null_properties, 1, 0 }, /* 0 = big brother of root */
1207 1221 + { propv_root, 0, 2 }, /* 1 "/" */
... ... @@ -1215,33 +1229,18 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1215 1229 + { propv_sbus_espdma, 0, 10 }, /* 9 "/iommu/sbus/espdma" */
1216 1230 + { propv_sbus_espdma_esp, 0, 0 }, /* 10 "/iommu/sbus/espdma/esp" */
1217 1231 + { propv_cpu, 12, 0 }, /* 11 "/STP1012PGA" */
1218   -+ { propv_obio, 0, 13 }, /* 12 "/obio" */
  1232 ++ { propv_obio, 22, 13 }, /* 12 "/obio" */
1219 1233 + { propv_obio_int, 14, 0 }, /* 13 "/obio/interrupt" */
1220 1234 + { propv_obio_cnt, 15, 0 }, /* 14 "/obio/counter" */
1221 1235 + { propv_obio_eep, 16, 0 }, /* 15 "/obio/eeprom" */
1222 1236 + { propv_obio_auxio, 17, 0 }, /* 16 "/obio/auxio" */
1223   -+ { propv_obio_zs, 18, 0 }, /* 17 "/obio/zs@0,0" */
1224   -+ { propv_obio_zs1, 19, 0 }, /* 18 "/obio/zs@0,100000" */
  1237 ++ { propv_obio_zs1, 18, 0 }, /* 17 "/obio/zs@0,100000"
  1238 ++ Must be before zs@0,0! */
  1239 ++ { propv_obio_zs, 19, 0 }, /* 18 "/obio/zs@0,0" */
1225 1240 + { propv_obio_fd, 20, 0 }, /* 19 "/obio/SUNW,fdtwo" */
1226 1241 + { propv_obio_pw, 21, 0 }, /* 20 "/obio/power" */
1227 1242 + { propv_obio_cf, 0, 0 }, /* 21 "/obio/slavioconfig@0,800000" */
1228   -+#if 0
1229   -+ { propv_obio_su, 14, 0 }, /* 13 "/obio/su" */
1230   -+ { propv_cpu, 18, 0 }, /* 17 "/STP1012PGA" */
1231   -+ { propv_cpu, 19, 0 }, /* 18 "/STP1012PGA" */
1232   -+
1233   -+ { propv_cpu, 20, 0 }, /* 19 "/STP1012PGA" */
1234   -+ { propv_cpu, 21, 0 }, /* 20 "/STP1012PGA" */
1235   -+ { propv_cpu, 22, 0 }, /* 21 "/STP1012PGA" */
1236   -+ { propv_cpu, 23, 0 }, /* 22 "/STP1012PGA" */
1237   -+ { propv_cpu, 24, 0 }, /* 23 "/STP1012PGA" */
1238   -+ { propv_cpu, 25, 0 }, /* 24 "/STP1012PGA" */
1239   -+ { propv_cpu, 26, 0 }, /* 25 "/STP1012PGA" */
1240   -+ { propv_cpu, 27, 0 }, /* 26 "/STP1012PGA" */
1241   -+ { propv_cpu, 28, 0 }, /* 27 "/STP1012PGA" */
1242   -+ { propv_cpu, 29, 0 }, /* 28 "/STP1012PGA" */
1243   -+ { propv_cpu, 30, 0 }, /* 29 "/STP1012PGA" */
1244   -+#endif
  1243 ++ { propv_options, 0, 0 }, /* 22 "/options" */
1245 1244 +};
1246 1245 +
1247 1246 +static struct linux_mlist_v0 totphys[MAX_BANKS];
... ... @@ -1379,6 +1378,8 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1379 1378 + obp_stdin = PROMDEV_KBD;
1380 1379 + obp_stdout = PROMDEV_SCREEN;
1381 1380 + }
  1381 ++ prop_zs_addr = map_io(0x71000000, 8);
  1382 ++ prop_zs1_addr = map_io(0x71100000, 8);
1382 1383 + return &romvec0;
1383 1384 +}
1384 1385 +
... ... @@ -1427,6 +1428,14 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1427 1428 +{
1428 1429 + const struct property *prop;
1429 1430 +
  1431 ++ if (!name) {
  1432 ++ // NULL name means get first property
  1433 ++#ifdef DEBUG_OBP
  1434 ++ printk("obp_getprop(%d, %x (NULL)) = %s\n", node, name,
  1435 ++ nodes[node].properties[0].name);
  1436 ++#endif
  1437 ++ return (int)nodes[node].properties[0].name;
  1438 ++ }
1430 1439 + prop = find_property(node,name);
1431 1440 + if (prop) {
1432 1441 + memcpy(value,prop->value,prop->length);
... ... @@ -1451,8 +1460,18 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1451 1460 +
1452 1461 +static const char *obp_nextprop(int node,char *name)
1453 1462 +{
1454   -+ const struct property *prop = find_property(node,name);
1455   -+ if (prop) {
  1463 ++ const struct property *prop;
  1464 ++
  1465 ++ if (!name || *name == '\0') {
  1466 ++ // NULL name means get first property
  1467 ++#ifdef DEBUG_OBP
  1468 ++ printk("obp_nextprop(%d, NULL) = %s\n", node,
  1469 ++ nodes[node].properties[0].name);
  1470 ++#endif
  1471 ++ return nodes[node].properties[0].name;
  1472 ++ }
  1473 ++ prop = find_property(node,name);
  1474 ++ if (prop && prop[1].name) {
1456 1475 +#ifdef DEBUG_OBP
1457 1476 + printk("obp_nextprop(%d, %s) = %s\n", node, name, prop[1].name);
1458 1477 +#endif
... ... @@ -1461,7 +1480,7 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1461 1480 +#ifdef DEBUG_OBP
1462 1481 + printk("obp_nextprop(%d, %s): not found\n", node, name);
1463 1482 +#endif
1464   -+ return NULL;
  1483 ++ return (const char *)-1;
1465 1484 +}
1466 1485 +
1467 1486 +static int obp_nbgetchar(void) {
... ... @@ -1510,9 +1529,9 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c
1510 1529 + //buf[8] = 'L';
1511 1530 + return num_blks;
1512 1531 +}
1513   -diff -ruN proll_18.orig/qemu/system_qemu.c proll-patch7/qemu/system_qemu.c
  1532 +diff -ruN proll_18.orig/qemu/system_qemu.c proll-patch8/qemu/system_qemu.c
1514 1533 --- proll_18.orig/qemu/system_qemu.c 1970-01-01 00:00:00.000000000 +0000
1515   -+++ proll-patch7/qemu/system_qemu.c 2005-03-02 16:10:20.000000000 +0000
  1534 ++++ proll-patch8/qemu/system_qemu.c 2005-03-02 16:10:20.000000000 +0000
1516 1535 @@ -0,0 +1,416 @@
1517 1536 +/**
1518 1537 + ** Proll (PROM replacement)
... ... @@ -1930,9 +1949,9 @@ diff -ruN proll_18.orig/qemu/system_qemu.c proll-patch7/qemu/system_qemu.c
1930 1949 + n = (n>>24 & 0xFF) | (n>>8 & 0xFF00) | ((n&0xFF00) << 8) | (n<<24);
1931 1950 + st_bypass(ptr, n);
1932 1951 +};
1933   -diff -ruN proll_18.orig/src/arp.c proll-patch7/src/arp.c
  1952 +diff -ruN proll_18.orig/src/arp.c proll-patch8/src/arp.c
1934 1953 --- proll_18.orig/src/arp.c 2001-12-24 05:12:31.000000000 +0000
1935   -+++ proll-patch7/src/arp.c 2004-11-13 15:50:49.000000000 +0000
  1954 ++++ proll-patch8/src/arp.c 2004-11-13 15:50:49.000000000 +0000
1936 1955 @@ -45,7 +45,7 @@
1937 1956 #endif
1938 1957 static struct arp_cache arp_list[ARPNUM]; /* ARP address cache */
... ... @@ -1967,9 +1986,9 @@ diff -ruN proll_18.orig/src/arp.c proll-patch7/src/arp.c
1967 1986 + def_gw = IP_ANY;
1968 1987 return(TRUE);
1969 1988 }
1970   -diff -ruN proll_18.orig/src/arp.h proll-patch7/src/arp.h
  1989 +diff -ruN proll_18.orig/src/arp.h proll-patch8/src/arp.h
1971 1990 --- proll_18.orig/src/arp.h 1999-03-18 03:39:43.000000000 +0000
1972   -+++ proll-patch7/src/arp.h 2004-11-13 15:50:49.000000000 +0000
  1991 ++++ proll-patch8/src/arp.h 2004-11-13 15:50:49.000000000 +0000
1973 1992 @@ -104,7 +104,7 @@
1974 1993 extern int init_arp __P((void));
1975 1994  
... ... @@ -1979,9 +1998,9 @@ diff -ruN proll_18.orig/src/arp.h proll-patch7/src/arp.h
1979 1998  
1980 1999 /* Add a new antry to the ARP cache */
1981 2000 extern void addcache __P((unsigned char *ha, t_ipaddr ip));
1982   -diff -ruN proll_18.orig/src/hconsole.c proll-patch7/src/hconsole.c
  2001 +diff -ruN proll_18.orig/src/hconsole.c proll-patch8/src/hconsole.c
1983 2002 --- proll_18.orig/src/hconsole.c 2002-07-23 05:52:48.000000000 +0000
1984   -+++ proll-patch7/src/hconsole.c 2005-03-02 17:03:09.000000000 +0000
  2003 ++++ proll-patch8/src/hconsole.c 2005-03-02 17:03:09.000000000 +0000
1985 2004 @@ -29,6 +29,10 @@
1986 2005 struct raster r_master; /* For a case of resize, whole fb */
1987 2006 struct raster r_0; /* malloc() erzatz */
... ... @@ -2005,9 +2024,9 @@ diff -ruN proll_18.orig/src/hconsole.c proll-patch7/src/hconsole.c
2005 2024 t->r_ = r;
2006 2025 t->r0_ = q;
2007 2026 t->f_ = &f_master;
2008   -diff -ruN proll_18.orig/src/lat7_2.bm proll-patch7/src/lat7_2.bm
  2027 +diff -ruN proll_18.orig/src/lat7_2.bm proll-patch8/src/lat7_2.bm
2009 2028 --- proll_18.orig/src/lat7_2.bm 1999-02-27 05:48:54.000000000 +0000
2010   -+++ proll-patch7/src/lat7_2.bm 2004-11-13 15:50:49.000000000 +0000
  2029 ++++ proll-patch8/src/lat7_2.bm 2004-11-13 15:50:49.000000000 +0000
2011 2030 @@ -1,6 +1,6 @@
2012 2031 #define lat7_2_width 128
2013 2032 #define lat7_2_height 88
... ... @@ -2016,9 +2035,9 @@ diff -ruN proll_18.orig/src/lat7_2.bm proll-patch7/src/lat7_2.bm
2016 2035 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2017 2036 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x12, 0x1e, 0x0c, 0x02, 0x70, 0x18,
2018 2037 0x22, 0x22, 0x18, 0x00, 0x00, 0x18, 0x18, 0xff, 0x18, 0x00, 0x12, 0x02,
2019   -diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch7/src/lat7_2_swapped.bm
  2038 +diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch8/src/lat7_2_swapped.bm
2020 2039 --- proll_18.orig/src/lat7_2_swapped.bm 1970-01-01 00:00:00.000000000 +0000
2021   -+++ proll-patch7/src/lat7_2_swapped.bm 2004-11-13 15:50:49.000000000 +0000
  2040 ++++ proll-patch8/src/lat7_2_swapped.bm 2004-11-13 15:50:49.000000000 +0000
2022 2041 @@ -0,0 +1,121 @@
2023 2042 +#define lat7_2_width 128
2024 2043 +#define lat7_2_height 88
... ... @@ -2141,9 +2160,9 @@ diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch7/src/lat7_2_swapped.bm
2141 2160 + 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0x00, 0x00,
2142 2161 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x00, 0x00, 0x00, 0x00,
2143 2162 + 0x00, 0x00, 0x00, 0x00};
2144   -diff -ruN proll_18.orig/src/le.c proll-patch7/src/le.c
  2163 +diff -ruN proll_18.orig/src/le.c proll-patch8/src/le.c
2145 2164 --- proll_18.orig/src/le.c 2002-07-23 05:52:49.000000000 +0000
2146   -+++ proll-patch7/src/le.c 2004-11-13 15:50:49.000000000 +0000
  2165 ++++ proll-patch8/src/le.c 2004-11-13 15:50:49.000000000 +0000
2147 2166 @@ -185,8 +185,6 @@
2148 2167 unsigned short rap; /* register address port */
2149 2168 };
... ... @@ -2153,9 +2172,9 @@ diff -ruN proll_18.orig/src/le.c proll-patch7/src/le.c
2153 2172 /* The Lance uses 24 bit addresses */
2154 2173 /* On the Sun4c the DVMA will provide the remaining bytes for us */
2155 2174 /* On the Sun4m we have to instruct the ledma to provide them */
2156   -diff -ruN proll_18.orig/src/netinit.c proll-patch7/src/netinit.c
  2175 +diff -ruN proll_18.orig/src/netinit.c proll-patch8/src/netinit.c
2157 2176 --- proll_18.orig/src/netinit.c 2002-09-13 21:53:33.000000000 +0000
2158   -+++ proll-patch7/src/netinit.c 2004-11-13 15:50:49.000000000 +0000
  2177 ++++ proll-patch8/src/netinit.c 2004-11-13 15:50:49.000000000 +0000
2159 2178 @@ -49,13 +49,20 @@
2160 2179 unsigned char myhwaddr[ETH_ALEN]; /* my own hardware addr */
2161 2180 t_ipaddr myipaddr; /* my own IP address */
... ... @@ -2199,9 +2218,9 @@ diff -ruN proll_18.orig/src/netinit.c proll-patch7/src/netinit.c
2199 2218 fatal();
2200 2219 }
2201 2220 }
2202   -diff -ruN proll_18.orig/src/netpriv.h proll-patch7/src/netpriv.h
  2221 +diff -ruN proll_18.orig/src/netpriv.h proll-patch8/src/netpriv.h
2203 2222 --- proll_18.orig/src/netpriv.h 1999-04-27 05:39:37.000000000 +0000
2204   -+++ proll-patch7/src/netpriv.h 2004-11-13 15:50:49.000000000 +0000
  2223 ++++ proll-patch8/src/netpriv.h 2004-11-13 15:50:49.000000000 +0000
2205 2224 @@ -130,10 +130,9 @@
2206 2225 *
2207 2226 */
... ... @@ -2223,9 +2242,9 @@ diff -ruN proll_18.orig/src/netpriv.h proll-patch7/src/netpriv.h
2223 2242  
2224 2243 /* Empty read buffer */
2225 2244 extern void empty_buf __P((void));
2226   -diff -ruN proll_18.orig/src/openprom.h proll-patch7/src/openprom.h
  2245 +diff -ruN proll_18.orig/src/openprom.h proll-patch8/src/openprom.h
2227 2246 --- proll_18.orig/src/openprom.h 2002-07-14 02:26:30.000000000 +0000
2228   -+++ proll-patch7/src/openprom.h 2004-11-13 15:50:49.000000000 +0000
  2247 ++++ proll-patch8/src/openprom.h 2004-11-13 15:50:49.000000000 +0000
2229 2248 @@ -54,20 +54,20 @@
2230 2249 };
2231 2250  
... ... @@ -2287,9 +2306,9 @@ diff -ruN proll_18.orig/src/openprom.h proll-patch7/src/openprom.h
2287 2306 };
2288 2307  
2289 2308 /* More fun PROM structures for device probing. */
2290   -diff -ruN proll_18.orig/src/packet.c proll-patch7/src/packet.c
  2309 +diff -ruN proll_18.orig/src/packet.c proll-patch8/src/packet.c
2291 2310 --- proll_18.orig/src/packet.c 2000-02-11 04:56:45.000000000 +0000
2292   -+++ proll-patch7/src/packet.c 2004-11-13 15:50:49.000000000 +0000
  2311 ++++ proll-patch8/src/packet.c 2004-11-13 15:50:49.000000000 +0000
2293 2312 @@ -41,7 +41,7 @@
2294 2313 int aligner;
2295 2314 } wbuf;
... ... @@ -2317,9 +2336,9 @@ diff -ruN proll_18.orig/src/packet.c proll-patch7/src/packet.c
2317 2336 {
2318 2337 struct sk_buff *skb;
2319 2338 unsigned char *s;
2320   -diff -ruN proll_18.orig/src/printf.c proll-patch7/src/printf.c
  2339 +diff -ruN proll_18.orig/src/printf.c proll-patch8/src/printf.c
2321 2340 --- proll_18.orig/src/printf.c 1999-03-19 07:03:59.000000000 +0000
2322   -+++ proll-patch7/src/printf.c 2004-11-13 15:50:49.000000000 +0000
  2341 ++++ proll-patch8/src/printf.c 2004-11-13 15:50:49.000000000 +0000
2323 2342 @@ -19,7 +19,7 @@
2324 2343 static void printn(struct prf_fp *, unsigned long, unsigned int);
2325 2344 static void putchar(char, struct prf_fp *);
... ... @@ -2347,9 +2366,9 @@ diff -ruN proll_18.orig/src/printf.c proll-patch7/src/printf.c
2347 2366 putchar(c,filog);
2348 2367 } else if (c == 'l' || c == 'O') {
2349 2368 printn(filog, (long)va_arg(adx,long), c=='l'?10:8);
2350   -diff -ruN proll_18.orig/src/rconsole.c proll-patch7/src/rconsole.c
  2369 +diff -ruN proll_18.orig/src/rconsole.c proll-patch8/src/rconsole.c
2351 2370 --- proll_18.orig/src/rconsole.c 1999-01-16 07:16:55.000000000 +0000
2352   -+++ proll-patch7/src/rconsole.c 2004-11-13 15:50:49.000000000 +0000
  2371 ++++ proll-patch8/src/rconsole.c 2004-11-13 15:50:49.000000000 +0000
2353 2372 @@ -28,12 +28,18 @@
2354 2373 * move to California. Only plain lat7 survived.
2355 2374 * I recreated lat7-1 changes in lat7-2. --zaitcev
... ... @@ -2404,9 +2423,9 @@ diff -ruN proll_18.orig/src/rconsole.c proll-patch7/src/rconsole.c
2404 2423 p->nchars_ = LAT7_NCHARS;
2405 2424 p->width_ = LAT7_WIDTH;
2406 2425 p->height_ = LAT7_HEIGHT;
2407   -diff -ruN proll_18.orig/src/rconsole.h proll-patch7/src/rconsole.h
  2426 +diff -ruN proll_18.orig/src/rconsole.h proll-patch8/src/rconsole.h
2408 2427 --- proll_18.orig/src/rconsole.h 1999-01-16 05:00:59.000000000 +0000
2409   -+++ proll-patch7/src/rconsole.h 2004-11-13 15:50:49.000000000 +0000
  2428 ++++ proll-patch8/src/rconsole.h 2004-11-13 15:50:49.000000000 +0000
2410 2429 @@ -13,10 +13,10 @@
2411 2430 */
2412 2431  
... ... @@ -2420,9 +2439,9 @@ diff -ruN proll_18.orig/src/rconsole.h proll-patch7/src/rconsole.h
2420 2439 int nchars_; /* 128 for ASCII ... 65536 for Unicode */
2421 2440 int width_; /* [Pixels]. Maximum size is 16. */
2422 2441 int height_; /* [Pixels == scan lines]. */
2423   -diff -ruN proll_18.orig/src/romlib.h proll-patch7/src/romlib.h
  2442 +diff -ruN proll_18.orig/src/romlib.h proll-patch8/src/romlib.h
2424 2443 --- proll_18.orig/src/romlib.h 1999-04-20 04:26:45.000000000 +0000
2425   -+++ proll-patch7/src/romlib.h 2004-11-13 15:50:49.000000000 +0000
  2444 ++++ proll-patch8/src/romlib.h 2004-11-13 15:50:49.000000000 +0000
2426 2445 @@ -73,12 +73,12 @@
2427 2446 #define memcpy(dst, src, len) bcopy(src, dst, len)
2428 2447 #define memcmp(x1, x2, len) bcmp(x1, x2, len)
... ... @@ -2439,9 +2458,9 @@ diff -ruN proll_18.orig/src/romlib.h proll-patch7/src/romlib.h
2439 2458  
2440 2459  
2441 2460 /*
2442   -diff -ruN proll_18.orig/src/sched_4m.c proll-patch7/src/sched_4m.c
  2461 +diff -ruN proll_18.orig/src/sched_4m.c proll-patch8/src/sched_4m.c
2443 2462 --- proll_18.orig/src/sched_4m.c 1999-04-27 05:48:51.000000000 +0000
2444   -+++ proll-patch7/src/sched_4m.c 2004-11-13 15:50:49.000000000 +0000
  2463 ++++ proll-patch8/src/sched_4m.c 2004-11-13 15:50:49.000000000 +0000
2445 2464 @@ -108,7 +108,7 @@
2446 2465 static int set_bolt; /* Tick counter limit */
2447 2466 static struct handsc hndv[16];
... ... @@ -2451,9 +2470,9 @@ diff -ruN proll_18.orig/src/sched_4m.c proll-patch7/src/sched_4m.c
2451 2470 0, 0, 0, 0, 0, 0, SUN4M_INT_ETHERNET, 0,
2452 2471 0, 0, 0, 0, 0, 0, 0, 0,
2453 2472 };
2454   -diff -ruN proll_18.orig/src/swap.c proll-patch7/src/swap.c
  2473 +diff -ruN proll_18.orig/src/swap.c proll-patch8/src/swap.c
2455 2474 --- proll_18.orig/src/swap.c 1970-01-01 00:00:00.000000000 +0000
2456   -+++ proll-patch7/src/swap.c 2004-11-13 15:50:49.000000000 +0000
  2475 ++++ proll-patch8/src/swap.c 2004-11-13 15:50:49.000000000 +0000
2457 2476 @@ -0,0 +1,21 @@
2458 2477 +// Convert the lat7 font so that no conversion is needed at runtime.
2459 2478 +#define ORIG
... ... @@ -2476,9 +2495,9 @@ diff -ruN proll_18.orig/src/swap.c proll-patch7/src/swap.c
2476 2495 + }
2477 2496 + printf("\n");
2478 2497 +}
2479   -diff -ruN proll_18.orig/src/system.c proll-patch7/src/system.c
  2498 +diff -ruN proll_18.orig/src/system.c proll-patch8/src/system.c
2480 2499 --- proll_18.orig/src/system.c 2002-07-23 05:52:49.000000000 +0000
2481   -+++ proll-patch7/src/system.c 2004-11-13 15:50:49.000000000 +0000
  2500 ++++ proll-patch8/src/system.c 2004-11-13 15:50:49.000000000 +0000
2482 2501 @@ -298,8 +298,8 @@
2483 2502 }
2484 2503  
... ... @@ -2531,9 +2550,9 @@ diff -ruN proll_18.orig/src/system.c proll-patch7/src/system.c
2531 2550 void fatal()
2532 2551 {
2533 2552 printk("fatal.");
2534   -diff -ruN proll_18.orig/src/system.h proll-patch7/src/system.h
  2553 +diff -ruN proll_18.orig/src/system.h proll-patch8/src/system.h
2535 2554 --- proll_18.orig/src/system.h 2002-09-13 21:53:32.000000000 +0000
2536   -+++ proll-patch7/src/system.h 2004-11-13 15:50:49.000000000 +0000
  2555 ++++ proll-patch8/src/system.h 2004-11-13 15:50:49.000000000 +0000
2537 2556 @@ -16,7 +16,7 @@
2538 2557 #define IOMAPSIZE (1*1024*1024) /* 1 Meg maximum: we do not map framebuffer. */
2539 2558 #define NCTX_SWIFT 0x100
... ... @@ -2543,9 +2562,9 @@ diff -ruN proll_18.orig/src/system.h proll-patch7/src/system.h
2543 2562  
2544 2563 #ifndef __ASSEMBLY__
2545 2564 struct bank {
2546   -diff -ruN proll_18.orig/src/udp.c proll-patch7/src/udp.c
  2565 +diff -ruN proll_18.orig/src/udp.c proll-patch8/src/udp.c
2547 2566 --- proll_18.orig/src/udp.c 2001-12-24 05:12:53.000000000 +0000
2548   -+++ proll-patch7/src/udp.c 2004-11-13 15:50:49.000000000 +0000
  2567 ++++ proll-patch8/src/udp.c 2004-11-13 15:50:49.000000000 +0000
2549 2568 @@ -81,7 +81,7 @@
2550 2569 int source;
2551 2570 int dest;
... ... @@ -2565,9 +2584,9 @@ diff -ruN proll_18.orig/src/udp.c proll-patch7/src/udp.c
2565 2584 /* Register IP packet type and set write buffer pointer */
2566 2585 if ((writebuf = reg_type(htons(ETH_P_IP), ip_recv)) == NULL)
2567 2586 return(FALSE);
2568   -diff -ruN proll_18.orig/src/vcons_zs.c proll-patch7/src/vcons_zs.c
  2587 +diff -ruN proll_18.orig/src/vcons_zs.c proll-patch8/src/vcons_zs.c
2569 2588 --- proll_18.orig/src/vcons_zs.c 1970-01-01 00:00:00.000000000 +0000
2570   -+++ proll-patch7/src/vcons_zs.c 2005-03-02 12:07:41.000000000 +0000
  2589 ++++ proll-patch8/src/vcons_zs.c 2005-03-20 10:25:39.000000000 +0000
2571 2590 @@ -0,0 +1,68 @@
2572 2591 +/**
2573 2592 + ** Console over 'zs' (Zilog serial port)
... ... @@ -2637,9 +2656,9 @@ diff -ruN proll_18.orig/src/vcons_zs.c proll-patch7/src/vcons_zs.c
2637 2656 + /* violent crash in the end */
2638 2657 + ;
2639 2658 +}
2640   -diff -ruN proll_18.orig/src/vconsole.c proll-patch7/src/vconsole.c
  2659 +diff -ruN proll_18.orig/src/vconsole.c proll-patch8/src/vconsole.c
2641 2660 --- proll_18.orig/src/vconsole.c 1999-11-08 03:10:28.000000000 +0000
2642   -+++ proll-patch7/src/vconsole.c 2005-03-02 14:29:05.000000000 +0000
  2661 ++++ proll-patch8/src/vconsole.c 2005-03-02 14:29:05.000000000 +0000
2643 2662 @@ -13,6 +13,10 @@
2644 2663  
2645 2664 struct hconsole hcons0;
... ... @@ -2804,9 +2823,9 @@ diff -ruN proll_18.orig/src/vconsole.c proll-patch7/src/vconsole.c
2804 2823 }
2805 2824 }
2806 2825 }
2807   -diff -ruN proll_18.orig/src/vconsole.h proll-patch7/src/vconsole.h
  2826 +diff -ruN proll_18.orig/src/vconsole.h proll-patch8/src/vconsole.h
2808 2827 --- proll_18.orig/src/vconsole.h 1999-11-08 00:58:13.000000000 +0000
2809   -+++ proll-patch7/src/vconsole.h 2005-03-02 12:40:12.000000000 +0000
  2828 ++++ proll-patch8/src/vconsole.h 2005-03-02 12:40:12.000000000 +0000
2810 2829 @@ -6,6 +6,8 @@
2811 2830 #ifndef VCONSOLE_H
2812 2831 #define VCONSOLE_H
... ...