From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HcRa7-0006EM-Lq for qemu-devel@nongnu.org; Fri, 13 Apr 2007 15:37:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HcRa7-0006CY-6r for qemu-devel@nongnu.org; Fri, 13 Apr 2007 15:37:15 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HcRa6-0006Bk-II for qemu-devel@nongnu.org; Fri, 13 Apr 2007 15:37:14 -0400 Received: from ug-out-1314.google.com ([66.249.92.171]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HcRVm-0007Vk-2Y for qemu-devel@nongnu.org; Fri, 13 Apr 2007 15:32:46 -0400 Received: by ug-out-1314.google.com with SMTP id j40so533567ugd for ; Fri, 13 Apr 2007 12:32:45 -0700 (PDT) Message-ID: Date: Fri, 13 Apr 2007 22:32:45 +0300 From: "Blue Swirl" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_12772_18081008.1176492765163" Subject: [Qemu-devel] FDC and M48T59 save/reset methods Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel ------=_Part_12772_18081008.1176492765163 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, I'd like to commit the attached FDC and M48T59 device save and reset methods. After this change, all Sparc32 devices can be saved. Any comments? ------=_Part_12772_18081008.1176492765163 Content-Type: text/x-patch; name=common_arch_saves.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_f0h16zo2 Content-Disposition: attachment; filename="common_arch_saves.diff" SW5kZXg6IHFlbXUvaHcvZmRjLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL2h3L2ZkYy5jCTIw MDctMDQtMTMgMTk6MjI6NTYuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L2h3L2ZkYy5jCTIwMDct MDQtMTMgMTk6MjU6MDkuMDAwMDAwMDAwICswMDAwCkBAIC00ODUsNiArNDg1LDY0IEBACiAgICAg ZmRjdHJsX3dyaXRlX21lbSwKIH07CiAKK3N0YXRpYyB2b2lkIGZkY19zYXZlIChRRU1VRmlsZSAq Ziwgdm9pZCAqb3BhcXVlKQoreworICAgIGZkY3RybF90ICpzID0gb3BhcXVlOworCisgICAgcWVt dV9wdXRfOHMoZiwgJnMtPnN0YXRlKTsKKyAgICBxZW11X3B1dF84cyhmLCAmcy0+ZG1hX2VuKTsK KyAgICBxZW11X3B1dF84cyhmLCAmcy0+Y3VyX2Rydik7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMt PmJvb3RzZWwpOworICAgIHFlbXVfcHV0X2J1ZmZlcihmLCBzLT5maWZvLCBGRF9TRUNUT1JfTEVO KTsKKyAgICBxZW11X3B1dF9iZTMycyhmLCAmcy0+ZGF0YV9wb3MpOworICAgIHFlbXVfcHV0X2Jl MzJzKGYsICZzLT5kYXRhX2xlbik7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPmRhdGFfc3RhdGUp OworICAgIHFlbXVfcHV0XzhzKGYsICZzLT5kYXRhX2Rpcik7CisgICAgcWVtdV9wdXRfOHMoZiwg JnMtPmludF9zdGF0dXMpOworICAgIHFlbXVfcHV0XzhzKGYsICZzLT5lb3QpOworICAgIHFlbXVf cHV0XzhzKGYsICZzLT50aW1lcjApOworICAgIHFlbXVfcHV0XzhzKGYsICZzLT50aW1lcjEpOwor ICAgIHFlbXVfcHV0XzhzKGYsICZzLT5wcmVjb21wX3Ryayk7CisgICAgcWVtdV9wdXRfOHMoZiwg JnMtPmNvbmZpZyk7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPmxvY2spOworICAgIHFlbXVfcHV0 XzhzKGYsICZzLT5wd3JkKTsKK30KKworc3RhdGljIGludCBmZGNfbG9hZCAoUUVNVUZpbGUgKmYs IHZvaWQgKm9wYXF1ZSwgaW50IHZlcnNpb25faWQpCit7CisgICAgZmRjdHJsX3QgKnMgPSBvcGFx dWU7CisKKyAgICBpZiAodmVyc2lvbl9pZCAhPSAxKQorICAgICAgICByZXR1cm4gLUVJTlZBTDsK KworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5zdGF0ZSk7CisgICAgcWVtdV9nZXRfOHMoZiwgJnMt PmRtYV9lbik7CisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmN1cl9kcnYpOworICAgIHFlbXVfZ2V0 XzhzKGYsICZzLT5ib290c2VsKTsKKyAgICBxZW11X2dldF9idWZmZXIoZiwgcy0+ZmlmbywgRkRf U0VDVE9SX0xFTik7CisgICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmRhdGFfcG9zKTsKKyAgICBx ZW11X2dldF9iZTMycyhmLCAmcy0+ZGF0YV9sZW4pOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5k YXRhX3N0YXRlKTsKKyAgICBxZW11X2dldF84cyhmLCAmcy0+ZGF0YV9kaXIpOworICAgIHFlbXVf Z2V0XzhzKGYsICZzLT5pbnRfc3RhdHVzKTsKKyAgICBxZW11X2dldF84cyhmLCAmcy0+ZW90KTsK KyAgICBxZW11X2dldF84cyhmLCAmcy0+dGltZXIwKTsKKyAgICBxZW11X2dldF84cyhmLCAmcy0+ dGltZXIxKTsKKyAgICBxZW11X2dldF84cyhmLCAmcy0+cHJlY29tcF90cmspOworICAgIHFlbXVf Z2V0XzhzKGYsICZzLT5jb25maWcpOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5sb2NrKTsKKyAg ICBxZW11X2dldF84cyhmLCAmcy0+cHdyZCk7CisKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGlj IHZvaWQgZmRjdHJsX2V4dGVybmFsX3Jlc2V0KHZvaWQgKm9wYXF1ZSkKK3sKKyAgICBmZGN0cmxf dCAqcyA9IG9wYXF1ZTsKKworICAgIGZkY3RybF9yZXNldChzLCAwKTsKK30KKwogZmRjdHJsX3Qg KmZkY3RybF9pbml0IChxZW11X2lycSBpcnEsIGludCBkbWFfY2hhbm4sIGludCBtZW1fbWFwcGVk LCAKICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgaW9fYmFzZSwKICAgICAgICAgICAg ICAgICAgICAgICAgQmxvY2tEcml2ZXJTdGF0ZSAqKmZkcykKQEAgLTUyNSw2ICs1ODMsOCBAQAog ICAgICAgICByZWdpc3Rlcl9pb3BvcnRfd3JpdGUoaW9fYmFzZSArIDB4MDEsIDUsIDEsICZmZGN0 cmxfd3JpdGUsIGZkY3RybCk7CiAgICAgICAgIHJlZ2lzdGVyX2lvcG9ydF93cml0ZShpb19iYXNl ICsgMHgwNywgMSwgMSwgJmZkY3RybF93cml0ZSwgZmRjdHJsKTsKICAgICB9CisgICAgcmVnaXN0 ZXJfc2F2ZXZtKCJmZGMiLCBpb19iYXNlLCAxLCBmZGNfc2F2ZSwgZmRjX2xvYWQsIGZkY3RybCk7 CisgICAgcWVtdV9yZWdpc3Rlcl9yZXNldChmZGN0cmxfZXh0ZXJuYWxfcmVzZXQsIGZkY3RybCk7 CiAgICAgZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewogICAgICAgICBmZF9yZXZhbGlkYXRlKCZm ZGN0cmwtPmRyaXZlc1tpXSk7CiAgICAgfQpJbmRleDogcWVtdS9ody9tNDh0NTkuYwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBxZW11Lm9yaWcvaHcvbTQ4dDU5LmMJMjAwNy0wNC0xMyAxOToyMjo1Ni4wMDAwMDAw MDAgKzAwMDAKKysrIHFlbXUvaHcvbTQ4dDU5LmMJMjAwNy0wNC0xMyAxOToyNTowOS4wMDAwMDAw MDAgKzAwMDAKQEAgLTU3NSwxMiArNTc1LDUwIEBACiAgICAgJm52cmFtX3JlYWRsLAogfTsKIAor c3RhdGljIHZvaWQgbTQ4dDU5X3NhdmUoUUVNVUZpbGUgKmYsIHZvaWQgKm9wYXF1ZSkKK3sKKyAg ICBtNDh0NTlfdCAqcyA9IG9wYXF1ZTsKKworICAgIHFlbXVfcHV0XzhzKGYsICZzLT5sb2NrKTsK KyAgICBxZW11X3B1dF9iZTE2cyhmLCAmcy0+YWRkcik7CisgICAgcWVtdV9wdXRfYnVmZmVyKGYs IHMtPmJ1ZmZlciwgcy0+c2l6ZSk7Cit9CisKK3N0YXRpYyBpbnQgbTQ4dDU5X2xvYWQoUUVNVUZp bGUgKmYsIHZvaWQgKm9wYXF1ZSwgaW50IHZlcnNpb25faWQpCit7CisgICAgbTQ4dDU5X3QgKnMg PSBvcGFxdWU7CisKKyAgICBpZiAodmVyc2lvbl9pZCAhPSAxKQorICAgICAgICByZXR1cm4gLUVJ TlZBTDsKKworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5sb2NrKTsKKyAgICBxZW11X2dldF9iZTE2 cyhmLCAmcy0+YWRkcik7CisgICAgcWVtdV9nZXRfYnVmZmVyKGYsIHMtPmJ1ZmZlciwgcy0+c2l6 ZSk7CisKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgbTQ4dDU5X3Jlc2V0KHZvaWQg Km9wYXF1ZSkKK3sKKyAgICBtNDh0NTlfdCAqTlZSQU0gPSBvcGFxdWU7CisKKyAgICBpZiAoTlZS QU0tPmFscm1fdGltZXIgIT0gTlVMTCkgeworICAgICAgICBxZW11X2RlbF90aW1lcihOVlJBTS0+ YWxybV90aW1lcik7CisJTlZSQU0tPmFscm1fdGltZXIgPSBOVUxMOworICAgIH0KKyAgICBpZiAo TlZSQU0tPndkX3RpbWVyICE9IE5VTEwpIHsKKyAgICAgICAgcWVtdV9kZWxfdGltZXIoTlZSQU0t PndkX3RpbWVyKTsKKwlOVlJBTS0+d2RfdGltZXIgPSBOVUxMOworICAgIH0KK30KKwogLyogSW5p dGlhbGlzYXRpb24gcm91dGluZSAqLwogbTQ4dDU5X3QgKm00OHQ1OV9pbml0IChxZW11X2lycSBJ UlEsIHRhcmdldF91bG9uZyBtZW1fYmFzZSwKICAgICAgICAgICAgICAgICAgICAgICAgdWludDMy X3QgaW9fYmFzZSwgdWludDE2X3Qgc2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgaW50IHR5 cGUpCiB7CiAgICAgbTQ4dDU5X3QgKnM7CisgICAgdGFyZ2V0X3Vsb25nIHNhdmVfYmFzZTsKIAog ICAgIHMgPSBxZW11X21hbGxvY3ooc2l6ZW9mKG00OHQ1OV90KSk7CiAgICAgaWYgKCFzKQpAQCAt NjEwLDUgKzY0OCw5IEBACiAgICAgfQogICAgIHMtPmxvY2sgPSAwOwogCisgICAgcWVtdV9yZWdp c3Rlcl9yZXNldChtNDh0NTlfcmVzZXQsIHMpOworICAgIHNhdmVfYmFzZSA9IG1lbV9iYXNlID8g bWVtX2Jhc2UgOiBpb19iYXNlOworICAgIHJlZ2lzdGVyX3NhdmV2bSgibTQ4dDU5Iiwgc2F2ZV9i YXNlLCAxLCBtNDh0NTlfc2F2ZSwgbTQ4dDU5X2xvYWQsIHMpOworCiAgICAgcmV0dXJuIHM7CiB9 Cg== ------=_Part_12772_18081008.1176492765163--