From aa14b7969c0371809f9ba5e71ac5920cef3396cd Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 15 Mar 1991 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1991-03-15 --- port/devmnt.c | 1 - power/boot.c | 2 +- power/boot.h | 368 +++++++++++++++++++++++++------------------------- power/main.c | 8 +- 4 files changed, 191 insertions(+), 188 deletions(-) diff --git a/port/devmnt.c b/port/devmnt.c index 28520a301bf62905624442d1503ceb60afe41f72..50b6b396a777f7a68b67544dbfba496b7393503c 100644 --- a/port/devmnt.c +++ b/port/devmnt.c @@ -785,7 +785,6 @@ mntxmit(Mnt *m, Mnthdr *mh) n = (*devtab[q->msg->type].read)(q->msg, mh->mbr->buf, BUFSIZE); poperror(); /* 3 */ if(convM2S(mh->mbr->buf, &mh->rhdr, n) == 0){ - print("bad reply message\n"); mnterrdequeue(m, mh); error(Ebadmsg); } diff --git a/power/boot.c b/power/boot.c index 1e6aa64b33efb5100aab0711ccf2ba1bdec6beda..da7e4782f4b68c1e502c922a43e903d557ff9e1f 100644 --- a/power/boot.c +++ b/power/boot.c @@ -370,7 +370,7 @@ boot(int ask) fd = -1; if(strncmp(sys, "bit!", 4) == 0) fd = bitdial(srvname = &sys[4]); - if(strncmp(sys, "hot!", 4) == 0) + else if(strncmp(sys, "hot!", 4) == 0) fd = hotdial(srvname = &sys[4]); else if(strncmp(sys, "dk!", 3) == 0) fd = dkdial(srvname = &sys[3]); diff --git a/power/boot.h b/power/boot.h index 16545414fe6fb971143611e1ca966ea2f7178698..21f48f57ea40d1e67481373567f201052a561cf1 100644 --- a/power/boot.h +++ b/power/boot.h @@ -109,12 +109,12 @@ ulong bootcode[]={ 0x0afa50028, 0x00800045a, 0x024c6ffff, - 0x023c28002, + 0x023c28026, 0x0afa20004, 0x023c382c0, 0x00c0009e4, 0x0afa30008, - 0x023c287ce, + 0x023c2984a, 0x0afa20004, 0x023c382cb, 0x00c0009e4, @@ -123,39 +123,39 @@ ulong bootcode[]={ 0x08fa20024, 0x020030001, 0x010430029, - 0x023c587ce, + 0x023c5984a, 0x020030002, 0x010430019, 0x000000027, 0x08fa20018, 0x00c000733, 0x0afa20004, - 0x08fc580be, + 0x08fc58006, 0x000000027, 0x018a00003, 0x000000027, 0x00c000a46, 0x0afa50004, - 0x08fc38092, + 0x08fc3801a, 0x000000027, 0x018600004, 0x000000027, - 0x08fc28092, + 0x08fc2801a, 0x00c000a46, 0x0afa20004, - 0x0afc08092, - 0x0afc080be, + 0x0afc0801a, + 0x0afc08006, 0x020020001, 0x00c000733, 0x0afa20004, - 0x08fc580be, + 0x08fc58006, 0x008000485, 0x000000027, 0x0afa50004, 0x08cc30000, 0x00c0009e4, 0x0afa30008, - 0x023c28002, + 0x023c28026, 0x0afa20004, 0x08fa30028, 0x000000027, @@ -183,7 +183,7 @@ ulong bootcode[]={ 0x023bd000c, 0x023bdffdc, 0x0afbf0000, - 0x023c580c2, + 0x023c5808e, 0x08ca30000, 0x000000027, 0x01060000b, @@ -210,7 +210,7 @@ ulong bootcode[]={ 0x023bd0024, 0x000400008, 0x02001ffff, - 0x08fc2809a, + 0x08fc28042, 0x000000027, 0x014400048, 0x000000027, @@ -284,7 +284,7 @@ ulong bootcode[]={ 0x000400008, 0x02001ffff, 0x020020001, - 0x0afc2809a, + 0x0afc28042, 0x023c28373, 0x0afa20004, 0x020040002, @@ -354,9 +354,9 @@ ulong bootcode[]={ 0x000400008, 0x02001ffff, 0x023c283bd, - 0x0afc280a2, + 0x0afc28022, 0x023c383c3, - 0x0afc38042, + 0x0afc38102, 0x08fa10018, 0x08fa20000, 0x000000027, @@ -366,7 +366,7 @@ ulong bootcode[]={ 0x024a50008, 0x023bdffa8, 0x0afbf0000, - 0x08fc28102, + 0x08fc280c6, 0x000000027, 0x014400038, 0x000000027, @@ -376,7 +376,7 @@ ulong bootcode[]={ 0x00c000a64, 0x0afa40008, 0x004210008, - 0x0afc18096, + 0x0afc1801e, 0x023c383d2, 0x00c00089f, 0x0afa30004, @@ -390,7 +390,7 @@ ulong bootcode[]={ 0x02003000a, 0x00c000a7d, 0x0afa3000c, - 0x08fc58096, + 0x08fc5801e, 0x00421000a, 0x000000027, 0x00c000a46, @@ -410,7 +410,7 @@ ulong bootcode[]={ 0x0afa3000c, 0x00421000b, 0x000000027, - 0x08fc28096, + 0x08fc2801e, 0x00c000a46, 0x0afa20004, 0x023c3840f, @@ -421,7 +421,7 @@ ulong bootcode[]={ 0x000400008, 0x02001ffff, 0x020020001, - 0x0afc28102, + 0x0afc280c6, 0x0200307d0, 0x00c000a6e, 0x0afa30004, @@ -445,7 +445,7 @@ ulong bootcode[]={ 0x00c000a64, 0x0afa40008, 0x00421000c, - 0x0afc18092, + 0x0afc1801a, 0x08fa30054, 0x00c000a46, 0x0afa30004, @@ -468,7 +468,7 @@ ulong bootcode[]={ 0x00c000a24, 0x0afa40004, 0x0afa10010, - 0x08fc48092, + 0x08fc4801a, 0x023a20014, 0x0afa40004, 0x0afa20008, @@ -477,14 +477,14 @@ ulong bootcode[]={ 0x0afa4000c, 0x004210010, 0x000000027, - 0x08fc28092, + 0x08fc2801a, 0x00c000a46, 0x0afa20004, 0x08fa30054, 0x00c000a46, 0x0afa30004, 0x02002ffff, - 0x0afc28092, + 0x0afc2801a, 0x023a30014, 0x00c00089f, 0x0afa30004, @@ -493,9 +493,9 @@ ulong bootcode[]={ 0x000400008, 0x02001ffff, 0x023c28470, - 0x0afc280a2, + 0x0afc28022, 0x023c38473, - 0x0afc38042, + 0x0afc38102, 0x08fa10054, 0x08fa20000, 0x000000027, @@ -600,16 +600,16 @@ ulong bootcode[]={ 0x00c000948, 0x0afa20004, 0x020030032, - 0x0a3c3985a, + 0x0a3c3974a, 0x02002ffff, - 0x0a7c2985e, - 0x023c2985a, + 0x0a7c2974e, + 0x023c2974a, 0x0afa20004, - 0x023c4885a, + 0x023c4874a, 0x00c000a82, 0x0afa40008, 0x08fa30024, - 0x023c4885a, + 0x023c4874a, 0x0afa30004, 0x0afa40008, 0x0afa1001c, @@ -631,7 +631,7 @@ ulong bootcode[]={ 0x000400008, 0x000000825, 0x08fa20024, - 0x023c4885a, + 0x023c4874a, 0x0afa20004, 0x0afa40008, 0x020021000, @@ -651,9 +651,9 @@ ulong bootcode[]={ 0x000000027, 0x008000677, 0x000000027, - 0x023c3885a, + 0x023c3874a, 0x0afa30004, - 0x023c4985a, + 0x023c4974a, 0x0afa40008, 0x0afa1001c, 0x00c000e9d, @@ -665,22 +665,22 @@ ulong bootcode[]={ 0x08fa3001c, 0x000000027, 0x0afa30008, - 0x083c2885a, + 0x083c2874a, 0x000000027, 0x000021600, 0x000021603, 0x0afa2000c, - 0x083c3885b, + 0x083c3874b, 0x000000027, 0x000031e00, 0x000031e03, 0x0afa30010, - 0x083c2885c, + 0x083c2874c, 0x000000027, 0x000021600, 0x000021603, 0x0afa20014, - 0x083c3885d, + 0x083c3874d, 0x000000027, 0x000031e00, 0x000031e03, @@ -693,7 +693,7 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x083c3985a, + 0x083c3974a, 0x020020033, 0x010620008, 0x000000027, @@ -704,7 +704,7 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x087c2985e, + 0x087c2974e, 0x02003ffff, 0x010430008, 0x000000027, @@ -719,16 +719,16 @@ ulong bootcode[]={ 0x00c000948, 0x0afa30004, 0x020020034, - 0x0a3c2985a, + 0x0a3c2974a, 0x02003ffff, - 0x0a7c3985e, - 0x023c3985a, + 0x0a7c3974e, + 0x023c3974a, 0x0afa30004, - 0x023c4885a, + 0x023c4874a, 0x00c000a82, 0x0afa40008, 0x08fa20024, - 0x023c4885a, + 0x023c4874a, 0x0afa20004, 0x0afa40008, 0x0afa1001c, @@ -746,7 +746,7 @@ ulong bootcode[]={ 0x000400008, 0x000000825, 0x08fa20024, - 0x023c4885a, + 0x023c4874a, 0x0afa20004, 0x0afa40008, 0x020021000, @@ -761,9 +761,9 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x023c3885a, + 0x023c3874a, 0x0afa30004, - 0x023c4985a, + 0x023c4974a, 0x0afa40008, 0x00c000e9d, 0x0afa1000c, @@ -776,7 +776,7 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x087c3985e, + 0x087c3974e, 0x02002ffff, 0x010620008, 0x000000027, @@ -787,7 +787,7 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x083c2985a, + 0x083c2974a, 0x020030037, 0x01443000d, 0x000000027, @@ -795,7 +795,7 @@ ulong bootcode[]={ 0x0afa20004, 0x023c3859d, 0x0afa30008, - 0x023c2985a, + 0x023c2974a, 0x024420008, 0x00c00096d, 0x0afa2000c, @@ -803,7 +803,7 @@ ulong bootcode[]={ 0x023bd0020, 0x000400008, 0x000000825, - 0x083c3985a, + 0x083c3974a, 0x020020035, 0x010620008, 0x000000027, @@ -820,56 +820,42 @@ ulong bootcode[]={ 0x020010001, 0x023bdfeb0, 0x0afbf0000, - 0x08fc680be, + 0x08fc68006, 0x08fa20154, 0x000000027, 0x01040000a, 0x000000027, 0x023c385ba, 0x0afa30004, - 0x023c28002, + 0x023c28026, 0x0afa20008, 0x02003001c, 0x00c0008c5, 0x0afa3000c, - 0x08fc680be, + 0x08fc68006, 0x000000027, 0x000002825, 0x028a20005, - 0x010400021, + 0x010400013, 0x0afa50144, 0x02002ffff, - 0x0afc280be, - 0x023c28002, + 0x0afc28006, + 0x023c28026, 0x0afa20004, 0x023c485c1, 0x0afa40008, 0x020020004, 0x00c0009aa, 0x0afa2000c, - 0x014200006, - 0x000000027, - 0x023c28002, - 0x024420004, + 0x01420011f, + 0x023c58026, + 0x024a20004, + 0x0afa20140, 0x00c0004ab, 0x0afa20004, - 0x0afc180be, - 0x023c38002, - 0x0afa30004, - 0x023c485c6, - 0x0afa40008, - 0x020030004, - 0x00c0009aa, - 0x0afa3000c, - 0x01420011f, - 0x023c58002, - 0x024a30004, - 0x0afa30140, - 0x00c0005f6, - 0x0afa30004, 0x000013025, 0x004c0010e, - 0x0afc680be, + 0x0afc68006, 0x004c10008, 0x000000027, 0x023c285f2, @@ -890,14 +876,14 @@ ulong bootcode[]={ 0x023c38601, 0x00c000948, 0x0afa30004, - 0x023c2885a, + 0x023c2874a, 0x0afa20004, 0x023c38609, 0x0afa30008, 0x08fa20140, 0x00c000992, 0x0afa2000c, - 0x023c2885a, + 0x023c2874a, 0x0afa20004, 0x020040001, 0x0afa40008, @@ -909,23 +895,23 @@ ulong bootcode[]={ 0x023c3860f, 0x00c0008b1, 0x0afa30004, - 0x023c2885a, + 0x023c2874a, 0x0afa20004, 0x023c38616, 0x0afa30008, - 0x08fc280be, + 0x08fc28006, 0x00c000992, 0x0afa2000c, - 0x023c3885a, + 0x023c3874a, 0x00c000a24, 0x0afa30004, 0x0afa10014, - 0x023c4885a, + 0x023c4874a, 0x00c000a24, 0x0afa40004, 0x0afa10010, 0x08fa40148, - 0x023c3885a, + 0x023c3874a, 0x0afa40004, 0x0afa30008, 0x08fa40010, @@ -953,23 +939,23 @@ ulong bootcode[]={ 0x023c28627, 0x00c0008b1, 0x0afa20004, - 0x023c3885a, + 0x023c3874a, 0x0afa30004, 0x023c2862e, 0x0afa20008, - 0x08fc380be, + 0x08fc38006, 0x00c000992, 0x0afa3000c, - 0x023c2885a, + 0x023c2874a, 0x00c000a24, 0x0afa20004, 0x0afa10014, - 0x023c4885a, + 0x023c4874a, 0x00c000a24, 0x0afa40004, 0x0afa10010, 0x08fa40148, - 0x023c3885a, + 0x023c3874a, 0x0afa40004, 0x0afa30008, 0x08fa40010, @@ -999,7 +985,7 @@ ulong bootcode[]={ 0x023c28644, 0x00c0008b1, 0x0afa20004, - 0x08fc280be, + 0x08fc28006, 0x023c48649, 0x0afa20004, 0x0afa40008, @@ -1063,8 +1049,8 @@ ulong bootcode[]={ 0x023c28670, 0x00c000948, 0x0afa20004, - 0x08fc580a2, - 0x08fc38042, + 0x08fc58022, + 0x08fc38102, 0x000000027, 0x010600015, 0x000000027, @@ -1074,19 +1060,19 @@ ulong bootcode[]={ 0x0afa30008, 0x00c000992, 0x0afa5000c, - 0x08fc38042, + 0x08fc38102, 0x023a20018, 0x0afa30004, 0x0afa20008, 0x00c000a41, 0x0afa0000c, - 0x08fc38042, + 0x08fc38102, 0x023c28681, 0x0afa30004, 0x0afa20008, 0x00c000a41, 0x0afa0000c, - 0x08fc580a2, + 0x08fc58022, 0x000000027, 0x010a00012, 0x000000027, @@ -1145,23 +1131,37 @@ ulong bootcode[]={ 0x0200203e8, 0x00c000a6e, 0x0afa20004, - 0x08fc680be, + 0x08fc68006, 0x08fa20144, 0x008000744, 0x024450001, 0x0afa50004, + 0x023c485c6, + 0x0afa40008, + 0x020030004, + 0x00c0009aa, + 0x0afa3000c, + 0x014200007, + 0x023c58026, + 0x024a30004, + 0x0afa30140, + 0x00c0005f6, + 0x0afa30004, + 0x008000757, + 0x000013025, + 0x0afa50004, 0x023c485cb, 0x0afa40008, 0x020020003, 0x00c0009aa, 0x0afa2000c, 0x014200007, - 0x023c58002, + 0x023c58026, 0x024a20003, 0x0afa20140, 0x00c00056d, 0x0afa20004, - 0x008000765, + 0x008000757, 0x000013025, 0x0afa50004, 0x023c485cf, @@ -1170,17 +1170,17 @@ ulong bootcode[]={ 0x00c0009aa, 0x0afa3000c, 0x014200007, - 0x023c58002, + 0x023c58026, 0x024a30006, 0x0afa30140, 0x00c0004b6, 0x0afa30004, - 0x008000765, + 0x008000757, 0x000013025, 0x0afa50140, 0x00c0004b6, 0x0afa50004, - 0x008000765, + 0x008000757, 0x000013025, 0x023bdffac, 0x0afbf0000, @@ -1268,7 +1268,7 @@ ulong bootcode[]={ 0x000002825, 0x028a20021, 0x010400011, - 0x023c6874a, + 0x023c697c6, 0x000051080, 0x000461021, 0x08c420000, @@ -1293,7 +1293,7 @@ ulong bootcode[]={ 0x000002025, 0x028820021, 0x01040000d, - 0x023c5874a, + 0x023c597c6, 0x000041080, 0x000451021, 0x08c420000, @@ -1316,7 +1316,7 @@ ulong bootcode[]={ 0x000000027, 0x00c00092c, 0x0afa00004, - 0x023c380a6, + 0x023c38046, 0x00c00092c, 0x0afa30004, 0x08fa20000, @@ -1325,7 +1325,7 @@ ulong bootcode[]={ 0x023bd0008, 0x023bdfff0, 0x0afbf0000, - 0x023c6874a, + 0x023c697c6, 0x020040020, 0x004800010, 0x000000027, @@ -1341,7 +1341,7 @@ ulong bootcode[]={ 0x000a0f809, 0x0ac400000, 0x08fa4000c, - 0x023c6874a, + 0x023c697c6, 0x008000930, 0x02484ffff, 0x08fa30014, @@ -1373,13 +1373,13 @@ ulong bootcode[]={ 0x0afa10014, 0x00421000c, 0x000012825, - 0x08fc38086, + 0x08fc38002, 0x000000027, 0x024630001, 0x02862000a, 0x014400006, - 0x0afc38086, - 0x023c280f2, + 0x0afc38002, + 0x023c2800a, 0x00c00092c, 0x0afa20004, 0x08fa50014, @@ -1410,13 +1410,13 @@ ulong bootcode[]={ 0x0afa10014, 0x00421000c, 0x000012825, - 0x08fc38086, + 0x08fc38002, 0x000000027, 0x024630001, 0x02862000a, 0x014400006, - 0x0afc38086, - 0x023c280f2, + 0x0afc38002, + 0x023c2800a, 0x00c00092c, 0x0afa20004, 0x08fa50014, @@ -1428,7 +1428,7 @@ ulong bootcode[]={ 0x023bdffe4, 0x0afbf0000, 0x08fa50020, - 0x08fc2808a, + 0x08fc280d6, 0x024a41000, 0x0afa20014, 0x0afa50004, @@ -1441,7 +1441,7 @@ ulong bootcode[]={ 0x0afa40010, 0x08fa20014, 0x000000027, - 0x0afc2808a, + 0x0afc280d6, 0x08fa20020, 0x000000027, 0x000220823, @@ -1709,7 +1709,7 @@ ulong bootcode[]={ 0x038620034, 0x01040000d, 0x000000027, - 0x023c3801e, + 0x023c380e2, 0x0afa30004, 0x080a20000, 0x000000027, @@ -2760,7 +2760,7 @@ ulong bootcode[]={ 0x038430034, 0x01060000d, 0x000000027, - 0x023c2802c, + 0x023c280f0, 0x0afa20004, 0x080c30000, 0x000000027, @@ -3578,7 +3578,7 @@ ulong bootcode[]={ 0x000400008, 0x023bd0014, 0x023bdfffc, - 0x08fc7808e, + 0x08fc780c2, 0x083a2000b, 0x028e3001e, 0x000021600, @@ -3597,7 +3597,7 @@ ulong bootcode[]={ 0x000031e03, 0x000661821, 0x024e20001, - 0x0afc2808e, + 0x0afc280c2, 0x0a0670000, 0x000051600, 0x000021603, @@ -3619,19 +3619,19 @@ ulong bootcode[]={ 0x0afbf0000, 0x08fa90044, 0x08fa60040, - 0x08fc2803e, + 0x08fc2805e, 0x000000027, 0x0afa2001c, - 0x08fc3806e, + 0x08fc380d2, 0x000000027, 0x0afa30018, 0x08fac0038, 0x000000027, - 0x0afcc803e, + 0x0afcc805e, 0x08fa3003c, 0x000000027, 0x02463ffff, - 0x0afc3806e, + 0x0afc380d2, 0x000062825, 0x080a50000, 0x020020025, @@ -3641,7 +3641,7 @@ ulong bootcode[]={ 0x024c60001, 0x014a00012, 0x000000027, - 0x08fc3806e, + 0x08fc380d2, 0x000000027, 0x00183202b, 0x014800002, @@ -3650,42 +3650,42 @@ ulong bootcode[]={ 0x0a1800000, 0x08fa3001c, 0x000000027, - 0x0afc3803e, + 0x0afc3805e, 0x08fa20018, 0x000000027, - 0x0afc2806e, + 0x0afc280d2, 0x08fa20000, 0x023bd0034, 0x000400008, 0x0000c0825, - 0x08fc3806e, + 0x08fc380d2, 0x000000027, 0x00183202b, 0x010800005, 0x000000027, 0x0000c1025, 0x0258c0001, - 0x0afcc803e, + 0x0afcc805e, 0x0a0450000, - 0x08fc2808a, + 0x08fc280d6, 0x000000027, 0x024420001, - 0x0afc2808a, + 0x0afc280d6, 0x02002000a, 0x014a20003, 0x000000027, 0x008001231, - 0x0afc0808a, + 0x0afc080d6, 0x020020009, 0x014a2ffd2, 0x000000027, - 0x08fc3808a, + 0x08fc380d6, 0x000000027, 0x024630007, 0x0201cfff8, 0x0007c1824, 0x008001231, - 0x0afc3808a, + 0x0afc380d6, 0x02007fc18, 0x0200bfc18, 0x000005025, @@ -3789,7 +3789,7 @@ ulong bootcode[]={ 0x000000027, 0x00040f809, 0x000000027, - 0x08fcc803e, + 0x08fcc805e, 0x08fab002c, 0x08fa90044, 0x08fa70030, @@ -4049,10 +4049,10 @@ ulong bootcode[]={ 0x0afa30004, 0x08fac0014, 0x08faa0018, - 0x08fc9806e, - 0x08fc8808a, + 0x08fc980d2, + 0x08fc880d6, 0x08fa7001c, - 0x08fc6803e, + 0x08fc6805e, 0x02002fc18, 0x011420003, 0x000012825, @@ -4077,14 +4077,14 @@ ulong bootcode[]={ 0x000000027, 0x000061025, 0x024c60001, - 0x0afc6803e, + 0x0afc6805e, 0x0a04b0000, 0x025080001, 0x02002000a, 0x015620008, - 0x0afc8808a, + 0x0afc880d6, 0x000004025, - 0x0afc0808a, + 0x0afc080d6, 0x02003fc18, 0x010e3ffe3, 0x000000027, @@ -4098,7 +4098,7 @@ ulong bootcode[]={ 0x0007c4024, 0x02003fc18, 0x010e3ffd8, - 0x0afc8808a, + 0x0afc880d6, 0x0080013db, 0x024e7ffff, 0x02002fc18, @@ -4119,13 +4119,13 @@ ulong bootcode[]={ 0x000000027, 0x000061825, 0x024c60001, - 0x0afc6803e, + 0x0afc6805e, 0x020040020, 0x0a0640000, 0x025080001, 0x024a50001, 0x008001410, - 0x0afc8808a, + 0x0afc880d6, 0x000aa202a, 0x01080ffba, 0x000000027, @@ -4134,13 +4134,13 @@ ulong bootcode[]={ 0x000000027, 0x000061025, 0x024c60001, - 0x0afc6803e, + 0x0afc6805e, 0x020040020, 0x0a0440000, 0x025080001, 0x024a50001, 0x00800141f, - 0x0afc8808a, + 0x0afc880d6, 0x023bdffec, 0x0afbf0000, 0x02002002a, @@ -4199,14 +4199,14 @@ ulong bootcode[]={ 0x000400008, 0x020010004, 0x023bdfffc, - 0x08fc5803e, - 0x08fc2806e, + 0x08fc5805e, + 0x08fc280d2, 0x000000027, 0x000a2202b, 0x010800005, 0x000000027, 0x024a20001, - 0x0afc2803e, + 0x0afc2805e, 0x020040025, 0x0a0a40000, 0x023bd0004, @@ -4323,8 +4323,8 @@ ulong bootcode[]={ 0x04444f800, 0x044821000, 0x034850003, - 0x0c7c58076, - 0x0c7c4807a, + 0x0c7c580ca, + 0x0c7c480ce, 0x0468010a1, 0x046241002, 0x038a50002, @@ -4386,8 +4386,8 @@ ulong bootcode[]={ 0x046201182, 0x00800150c, 0x023ae0078, - 0x0c7c1807e, - 0x0c7c08082, + 0x0c7c180da, + 0x0c7c080de, 0x000000027, 0x04626003e, 0x000000027, @@ -4791,8 +4791,8 @@ ulong bootcode[]={ 0x0a0620000, 0x0080015db, 0x024c60001, - 0x0c7c3807e, - 0x0c7c28082, + 0x0c7c380da, + 0x0c7c280de, 0x000000027, 0x046223182, 0x0e7a70040, @@ -4917,7 +4917,7 @@ ulong bootcode[]={ 0x01060000a, 0x000000027, 0x000041880, - 0x023c28046, + 0x023c28062, 0x000621821, 0x08c630000, 0x08fa20000, @@ -5239,40 +5239,16 @@ ulong bootcode[]={ 0x024e7ffff, 0x000000000, 0x000000000, + 0x07072696e, + 0x074206572, + 0x0726f7273, 0x000000000, 0x000000000, 0x000000000, 0x000000000, 0x000000000, - 0x062616420, - 0x074797065, - 0x03a202564, - 0x00a006261, - 0x064207479, - 0x070653a20, - 0x025640a00, - 0x000000000, - 0x000000000, - 0x000000000, - 0x000000001, - 0x00000000a, - 0x000000064, - 0x0000003e8, - 0x000002710, - 0x0000186a0, - 0x0000f4240, - 0x000989680, - 0x005f5e100, - 0x03b9aca00, - 0x000000000, - 0x000000000, - 0x03fd34413, - 0x055475a32, - 0x040240000, - 0x000000000, 0x000000000, 0x000000000, - 0x000000007, 0x000000000, 0x000000000, 0x000000000, @@ -5285,6 +5261,17 @@ ulong bootcode[]={ 0x061747573, 0x000000000, 0x000000000, + 0x000000001, + 0x00000000a, + 0x000000064, + 0x0000003e8, + 0x000002710, + 0x0000186a0, + 0x0000f4240, + 0x000989680, + 0x005f5e100, + 0x03b9aca00, + 0x000000000, 0x000007204, 0x000007209, 0x00000721e, @@ -5297,9 +5284,22 @@ ulong bootcode[]={ 0x000007276, 0x000000000, 0x000000000, - 0x07072696e, - 0x074206572, - 0x0726f7273, + 0x000000000, + 0x000000007, + 0x000000000, + 0x03fd34413, + 0x055475a32, + 0x000000000, + 0x000000000, + 0x040240000, + 0x000000000, + 0x062616420, + 0x074797065, + 0x03a202564, + 0x00a006261, + 0x064207479, + 0x070653a20, + 0x025640a00, 0x000000000, 0x000000000, 0x0001fffff, diff --git a/power/main.c b/power/main.c index 5dd7ba18f2bbd3892c841bf95bf9e861a2f5e86b..f360e3f525aedb6cd1564327fb5ace104209961c 100644 --- a/power/main.c +++ b/power/main.c @@ -210,11 +210,15 @@ init0(void) u->p->mach = m; spllo(); - chandevinit(); - + /* + * These are o.k. because rootinit is null. + * Then early kproc's will have a root and dot. + */ u->slash = (*devtab[0].attach)(0); u->dot = clone(u->slash, 0); + chandevinit(); + sp = (ulong*)(USTKTOP - argsize); touser(sp);