This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--16868152-1916715721-979489928=:304
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
Content-ID: <Pine.NXT.4.21.0101141740491.304@kaa.wew>

On Fri, 26 Jun 1998 perseant@hhhh.org wrote:
[...]
> >Description:
> 	The NeXT disklabel code does not currently support reading from a
> 	NextStep-generated disklabel.  I've stolen the Ultrix compatibility
> 	code and modified it to the point that (with a trivial tweak to ffs)
> 	I can mount a NeXT "4.3BSD" ffs from disk.

I was just tinkering with this myself, and I have some
comments. 

> diff -u -r1.5 disksubr.c
> --- next68k/disksubr.c	2000/11/20 08:24:19	1.5
> +++ next68k/disksubr.c	2001/01/11 22:05:01
[...]
> +		lp->d_bbsize = LABELSIZE;
> +		lp->d_sbsize = SBSIZE; /* XXX KS */
> +		for (part = 0; part < MAXPARTITIONS; part++) {
> +			cpp = cdlp->cd_partitions + part;
> +			if (cpp->cp_size >= 0 && cpp->cp_offset >= 0) {
> +				/* XXX is this the correct use of cd_front? */
> +				if (part != RAW_PART && cpp->cp_offset == 0) {
> +					cpp->cp_offset = cdlp->cd_front;
> +					cpp->cp_size -= cdlp->cd_front;
> +				}

Isn't this supposed to be something like this?
  lp->d_partitions[part].p_size = cpp->cp_size * msec;
  lp->d_partitions[part].p_offset = (cpp->cp_offset + cdlp->cd_front) * msec;

There's prior art from Rolf Grossmann in arch/next68k/stand/boot/sd.c
which seems to suggest this.

[...]
> +			} else if (part == RAW_PART) {
> +				/* If RAW_PART was empty, make one up */
I assumed this is already filled in by sdgetdefaultlabel()?

I'd suppose a boot disk would need a NeXT disklabel for the PROM to
recognize it. So being able to write a NeXT disklabel seems useful to me.

It's easy enough to store the necessary info in osdep, and one would
probably translate the info from the disklabel into cpu_disklabel in
writelabel(). But how is selected whether a native or NetBSD label is
wanted?

I've appended a version of your patch which tries to cater for the fact
that NetBSD and NS use different whole-platter partitions (sd#c vs.
rsd#h). Does this make sense?


Regards,
Timm
-- 
Timm Wetzel       <twetzel@gwdg.de>
Max-Planck-Institut fuer biophysikalische Chemie, Abt. 081
Am Fassberg 11, D-37077 Goettingen

--16868152-1916715721-979489928=:304
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="disksubr.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.NXT.4.21.0101141732080.304@kaa.wew>
Content-Description: 
Content-Disposition: ATTACHMENT; FILENAME="disksubr.diff"

SW5kZXg6IC4uLy4uL25leHQ2OGsvZGlza3N1YnIuYw0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jbGllbnRzL2N2c3Jvb3QvbmV0YnNk
L3NyYy9zeXMvYXJjaC9uZXh0NjhrL25leHQ2OGsvZGlza3N1YnIuYyx2DQpy
ZXRyaWV2aW5nIHJldmlzaW9uIDEuMS4xLjINCmRpZmYgLXUgLXIxLjEuMS4y
IGRpc2tzdWJyLmMNCi0tLSBkaXNrc3Vici5jCTIwMDAvMDYvMDggMjI6MTk6
NTYJMS4xLjEuMg0KKysrIGRpc2tzdWJyLmMJMjAwMS8wMS8xNCAxNTo1MTox
NQ0KQEAgLTQwLDEzICs0MCwyMyBAQA0KICAqCUAoIyl1ZnNfZGlza3N1YnIu
Ywk4LjUgKEJlcmtlbGV5KSAxLzIxLzk0DQogICovDQogDQorLyogI2luY2x1
ZGUgIm9wdF9jb21wYXRfbmV4dHN0ZXAuaCIgKi8NCisNCiAjaW5jbHVkZSA8
c3lzL3BhcmFtLmg+DQogI2luY2x1ZGUgPHN5cy9zeXN0bS5oPg0KICNpbmNs
dWRlIDxzeXMvYnVmLmg+DQorI2luY2x1ZGUgPHN5cy9kaXNrLmg+DQogI2lu
Y2x1ZGUgPHN5cy9kaXNrbGFiZWwuaD4NCiAjaW5jbHVkZSA8c3lzL3N5c2xv
Zy5oPg0KIA0KLSNpbmNsdWRlIDxzeXMvZGlzay5oPg0KKyNkZWZpbmUgQ09N
UEFUX05FWFRTVEVQDQorI2lmZGVmIENPTVBBVF9ORVhUU1RFUA0KKyMgaW5j
bHVkZSA8dWZzL3Vmcy9kaW5vZGUuaD4gLyogWFhYIGZvciBmcy5oICovDQor
IyBpbmNsdWRlIDx1ZnMvZmZzL2ZzLmg+ICAgICAvKiBYWFggZm9yIFNCU0la
RSAqLw0KKw0KK2NoYXIJKmNvbXBhdF9sYWJlbCBfX1AoKGRldl90IGRldiwg
dm9pZCAoKnN0cmF0KSBfX1AoKHN0cnVjdCBidWYgKmJwKSksDQorCSAgICBz
dHJ1Y3QgZGlza2xhYmVsICpscCwgc3RydWN0IGNwdV9kaXNrbGFiZWwgKm9z
ZGVwKSk7DQorI2VuZGlmDQogDQogI2RlZmluZQliX2N5bGluZGVyCWJfcmVz
aWQNCiANCkBAIC0xMDIsOCArMTEyLDEzMyBAQA0KIAl9DQogCWJwLT5iX2Zs
YWdzID0gQl9JTlZBTCB8IEJfQUdFOw0KIAlicmVsc2UoYnApOw0KKyNpZmRl
ZiBDT01QQVRfTkVYVFNURVANCisJLyoNCisJICogSWYgbm8gTmV0QlNEIGxh
YmVsIHdhcyBmb3VuZCwgY2hlY2sgZm9yIGEgTmV4dFN0ZXAgbGFiZWwgYW5k
DQorCSAqIGNvbnN0cnVjdCB0bmUgaW5jb3JlIGxhYmVsIGZyb20gdGhlIE5l
eHRTdGVwIHBhcnRpdGlvbiBpbmZvcm1hdGlvbi4NCisJICovDQorCWlmICht
c2cgIT0gTlVMTCkgew0KKwkJbXNnID0gY29tcGF0X2xhYmVsKGRldiwgc3Ry
YXQsIGxwLCBvc2RlcCk7DQorCQlpZiAobXNnID09IE5VTEwpIHsNCisJCQlw
cmludGYoIldBUk5JTkc6IHVzaW5nIE5leHRTdGVwIHBhcnRpdGlvbiBpbmZv
cm1hdGlvblxuIik7DQorCQkJLyogc2V0IGdlb21ldHJ5PyAqLw0KKwkJfQ0K
Kwl9DQorI2VuZGlmDQorCS8qIFhYWCBJZiBubyBsYWJlbCBvZiBlaXRoZXIg
dHlwZSBmb3VuZCwgZ2VuZXJhdGUgZGVmYXVsdCBsYWJlbCBoZXJlICovDQor
CXJldHVybiAobXNnKTsNCit9DQorDQorI2lmZGVmIENPTVBBVF9ORVhUU1RF
UA0KKy8qDQorICogR2l2ZW4gYSBidWZmZXIgYnAsIHRyeSBhbmQgaW50ZXJw
cmV0IGl0IGFzIGFuIE5leHRTdGVwIGRpc2sgbGFiZWwsDQorICogcHV0dGlu
ZyB0aGUgcGFydGl0aW9uIGluZm8gaW50byBhIG5hdGl2ZSBOZXRCU0QgbGFi
ZWwNCisgKi8NCitjaGFyICoNCitjb21wYXRfbGFiZWwoZGV2LCBzdHJhdCwg
bHAsIG9zZGVwKQ0KKwlkZXZfdCBkZXY7DQorCXZvaWQgKCpzdHJhdCkgX19Q
KChzdHJ1Y3QgYnVmICpicCkpOw0KKwlzdHJ1Y3QgZGlza2xhYmVsICpscDsN
CisJc3RydWN0IGNwdV9kaXNrbGFiZWwgKm9zZGVwOw0KK3sNCisJc3RydWN0
IGNwdV9kaXNrbGFiZWwgKmNkbHA7DQorCXN0cnVjdCBjcHVfcGFydGl0aW9u
ICpjcHA7DQorCXN0cnVjdCBidWYgKmJwID0gTlVMTDsNCisJY2hhciAqbXNn
ID0gTlVMTDsNCisJaW50IHBhcnQ7DQorCWludCBuc3BhcnQ7DQorCWludCBt
c2VjOw0KKw0KKwlicCA9IGdldGVibGsoKGludClMQUJFTFNJWkUpOw0KKwli
cC0+Yl9kZXYgPSBkZXY7DQorCWJwLT5iX2Jsa25vID0gTEFCRUxTRUNUT1I7
DQorCWJwLT5iX2Jjb3VudCA9IExBQkVMU0laRTsNCisJYnAtPmJfZmxhZ3Mg
fD0gQl9SRUFEOw0KKwlicC0+Yl9jeWxpbmRlciA9IExBQkVMU0VDVE9SIC8g
bHAtPmRfc2VjcGVyY3lsOw0KKwkoKnN0cmF0KShicCk7DQorDQorCWlmIChi
aW93YWl0KGJwKSkgew0KKyAgICAgICAgICAgICAgICBtc2cgPSAiSS9PIGVy
cm9yIjsNCisJCWdvdG8gZG9uZTsNCisJfQ0KKw0KKwljZGxwID0gKHN0cnVj
dCBjcHVfZGlza2xhYmVsICopYnAtPmJfZGF0YTsNCisJaWYgKElTX0RJU0tM
QUJFTChjZGxwKSkgew0KKwkJLyogWFhYIEtTIC0gY2hlY2sgdGhlIGNrc3Vt
IGhlcmUgKi8NCisjaWZkZWYgREVCVUcNCisJCXByaW50ZigiSW50ZXJwcmV0
aW5nIE5leHRTdGVwIGxhYmVsXG4iKTsNCisjZW5kaWYNCisJCS8qIHNhdmUg
Zm9yIGxhdGVyL3dyaXRlYmFjaz8gKi8NCisJCSpvc2RlcCA9ICpjZGxwOw0K
KwkJDQorCQlscC0+ZF9tYWdpYyA9IGNkbHAtPmNkX3ZlcnNpb247DQorCQls
cC0+ZF9ucGFydGl0aW9ucyA9IDA7DQorDQorI2lmIG5vdHlldA0KKwkJLyog
WFhYIG5vdCByZWFsbHksIHVudGlsIDFrIHNlY3RvcnMgYXJlIHJlYWxseSBz
dXBwb3J0ZWQgKi8NCisJCS8qIFhYWCBhbmQgdGhlbiBwcmVzdW1hYmx5IHRo
ZSBkaXNrIGRyaXZlciB3aWxsIGZpeCBmb3IgdXMgKi8NCisJCWlmIChjZGxw
LT5jZF9zZWNzaXplID4gbHAtPmRfc2Vjc2l6ZSkgew0KKwkJCW1zZWMgPSBj
ZGxwLT5jZF9zZWNzaXplIC8gbHAtPmRfc2Vjc2l6ZTsNCisJCQlscC0+ZF9z
ZWNzaXplID0gY2RscC0+Y2Rfc2Vjc2l6ZTsNCisJCQlscC0+ZF9uc2VjdG9y
cyAvPSBtc2VjOw0KKwkJCWxwLT5kX3NlY3BlcmN5bCAvPSBtc2VjOw0KKwkJ
CWxwLT5kX3NlY3BlcnVuaXQgLz0gbXNlYzsNCisJCX0gZWxzZSBpZiAoY2Rs
cC0+Y2Rfc2Vjc2l6ZSA8IGxwLT5kX3NlY3NpemUpIHsNCisJCQltc2VjID0g
bHAtPmRfc2Vjc2l6ZSAvIGNkbHAtPmNkX3NlY3NpemU7DQorCQkJbHAtPmRf
c2Vjc2l6ZSA9IGNkbHAtPmNkX3NlY3NpemU7DQorCQkJbHAtPmRfbnNlY3Rv
cnMgKj0gbXNlYzsNCisJCQlscC0+ZF9zZWNwZXJjeWwgKj0gbXNlYzsNCisJ
CQlscC0+ZF9zZWNwZXJ1bml0ICo9IG1zZWM7DQorCQl9DQorCQltc2VjID0g
MTsNCisjZWxzZQ0KKwkJbXNlYyA9IGNkbHAtPmNkX3NlY3NpemUgLyBscC0+
ZF9zZWNzaXplOw0KKyNlbmRpZg0KKwkJLyogc3RybmNweShscC0+ZF9wYWNr
bmFtZSwgY2RscC0+Y2RfbGFiZWwsIDE2KTsgKi8NCisJCXN0cm5jcHkobHAt
PmRfcGFja25hbWUsICJOZVhUU1RFUCBsYWJlbCIsIDE2KTsNCisJCWxwLT5k
X3JwbSA9IGNkbHAtPmNkX3JwbTsNCisJCWxwLT5kX2ludGVybGVhdmUgPSAx
Ow0KKwkJbHAtPmRfZmxhZ3MgPSAwOw0KKwkJbHAtPmRfYmJzaXplID0gTEFC
RUxTSVpFOw0KKwkJbHAtPmRfc2JzaXplID0gU0JTSVpFOyAvKiBYWFggS1Mg
Ki8NCisJCWZvciAocGFydCA9IDAsbnNwYXJ0PTA7IHBhcnQgPCBNQVhQQVJU
SVRJT05TOyBwYXJ0KyssbnNwYXJ0KyspIHsNCisJCQljcHAgPSBjZGxwLT5j
ZF9wYXJ0aXRpb25zICsgbnNwYXJ0Ow0KKwkJCWlmIChjcHAtPmNwX3NpemUg
Pj0gMCAmJiBjcHAtPmNwX29mZnNldCA+PSAwKSB7DQorCQkJCWlmIChwYXJ0
ID09IFJBV19QQVJUKQ0KKwkJCQkJcGFydCsrOyAvKiBhbHJlYWR5IGZpbGxl
ZCBpbiBieSBzZGdldGRlZmF1bHRsYWJlbCgpPyAqLw0KKwkJCQlscC0+ZF9w
YXJ0aXRpb25zW3BhcnRdLnBfc2l6ZSA9IGNwcC0+Y3Bfc2l6ZSAqIG1zZWM7
DQorCQkJCWxwLT5kX3BhcnRpdGlvbnNbcGFydF0ucF9vZmZzZXQgPSAoY3Bw
LT5jcF9vZmZzZXQgKyBjZGxwLT5jZF9mcm9udCkgKiBtc2VjOw0KKwkJCQls
cC0+ZF9wYXJ0aXRpb25zW3BhcnRdLnBfZnNpemUgPSBjcHAtPmNwX2ZzaXpl
Ow0KKwkJCQlscC0+ZF9wYXJ0aXRpb25zW3BhcnRdLnBfZnJhZyA9IGNwcC0+
Y3BfYnNpemUgLw0KKwkJCQkJY3BwLT5jcF9mc2l6ZTsNCisJCQkJbHAtPmRf
cGFydGl0aW9uc1twYXJ0XS5wX2NwZyA9IGNwcC0+Y3BfY3BnOw0KKwkJCQls
cC0+ZF9wYXJ0aXRpb25zW3BhcnRdLnBfZnN0eXBlID0NCisJCQkJCShzdHJu
Y21wKGNwcC0+Y3BfdHlwZSwgIjQuM0JTRCIsIDcpID09IDApID8gRlNfQlNE
RkZTIDogRlNfVU5VU0VEOw0KKyNpZmRlZiBERUJVRw0KKwkJCQlpZiAoY3Bw
LT5jcF90eXBlWzBdICYmDQorCQkJCSAgICBscC0+ZF9wYXJ0aXRpb25zW3Bh
cnRdLnBfZnN0eXBlID09IEZTX1VOVVNFRCkNCisJCQkJCXByaW50ZigiIElu
dGVycHJldGluZyB0eXBlIFwiJS45c1wiIGFzIFwidW51c2VkXCJcbiIsDQor
CQkJCQkgICAgICAgY3BwLT5jcF90eXBlKTsNCisjZW5kaWYJCQkJCQ0KKwkJ
CX0gDQorCQkJbHAtPmRfbnBhcnRpdGlvbnMrKzsNCisNCisjaWZkZWYgREVC
VUcNCisJCQlwcmludGYoIiBOZXh0U3RlcCBsYWJlbCBzZCVkJWM6IHN0YXJ0
ICVkIGxlbiAlZFxuIiwNCisJCQkgICAgICAgRElTS1VOSVQoZGV2KSwgImFi
Y2RlZmdoIltuc3BhcnRdLA0KKwkJCSAgICAgICBscC0+ZF9wYXJ0aXRpb25z
W3BhcnRdLnBfb2Zmc2V0LA0KKwkJCSAgICAgICBscC0+ZF9wYXJ0aXRpb25z
W3BhcnRdLnBfc2l6ZSk7DQorI2VuZGlmDQorCQl9DQorCX0gZWxzZSB7DQor
CQlwcmludGYoImxhYmVsOiAleFxuIiwgY2RscC0+Y2RfdmVyc2lvbik7DQor
CQltc2cgPSAoKG1zZyAhPSBOVUxMKSA/IG1zZzogIm5vIGRpc2sgbGFiZWwi
KTsNCisJfQ0KK2RvbmU6DQorCWJyZWxzZShicCk7DQogCXJldHVybiAobXNn
KTsNCiB9DQorI2VuZGlmIC8qIENPTVBBVF9ORVhUU1RFUCAqLw0KIA0KIC8q
DQogICogQ2hlY2sgbmV3IGRpc2sgbGFiZWwgZm9yIHNlbnNpYmlsaXR5IGJl
Zm9yZSBzZXR0aW5nIGl0Lg0K
--16868152-1916715721-979489928=:304--