From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LsJni-0001Rg-Q5 for qemu-devel@nongnu.org; Fri, 10 Apr 2009 12:41:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LsJne-0001Mi-4I for qemu-devel@nongnu.org; Fri, 10 Apr 2009 12:41:58 -0400 Received: from [199.232.76.173] (port=41820 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsJnd-0001MS-Tr for qemu-devel@nongnu.org; Fri, 10 Apr 2009 12:41:53 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:50548) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LsJnd-0000Rz-3J for qemu-devel@nongnu.org; Fri, 10 Apr 2009 12:41:53 -0400 Received: from smtp5-g21.free.fr (localhost [127.0.0.1]) by smtp5-g21.free.fr (Postfix) with ESMTP id 579FAD48176 for ; Fri, 10 Apr 2009 18:41:46 +0200 (CEST) Received: from [192.168.0.32] (rob92-10-88-171-126-33.fbx.proxad.net [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 5C4B4D48092 for ; Fri, 10 Apr 2009 18:41:44 +0200 (CEST) Message-ID: <49DF76C5.2010402@reactos.org> Date: Fri, 10 Apr 2009 18:41:41 +0200 From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030801090008090204070304" Subject: [Qemu-devel] [PATCH] Clean up rc4030 init function 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@nongnu.org This is a multi-part message in MIME format. --------------030801090008090204070304 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Hi, At the moment, rc4030 init function is returning some function pointers. Mark them non-static and define them in header file instead. Export also a function to read/write DMA memory, it will be required by=20 the netcard. Signed-off-by: Herv=E9 Poussineau Herv=E9 --------------030801090008090204070304 Content-Type: plain/text; name="rc4030_init.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="rc4030_init.diff" SW5kZXg6IG1pcHMuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIG1pcHMuaAkocmV2aXNpb24gNzA2 NykNCisrKyBtaXBzLmgJKHdvcmtpbmcgY29weSkNCkBAIC0yOCw5ICsyOCwxMSBAQA0KIAog LyogcmM0MDMwLmMgKi8KIHR5cGVkZWYgc3RydWN0IHJjNDAzMERNQVN0YXRlICpyYzQwMzBf ZG1hOwotdHlwZWRlZiB2b2lkICgqcmM0MDMwX2RtYV9mdW5jdGlvbikodm9pZCAqZG1hLCB1 aW50OF90ICpidWYsIGludCBsZW4pOwotcWVtdV9pcnEgKnJjNDAzMF9pbml0KHFlbXVfaXJx IHRpbWVyLCBxZW11X2lycSBqYXp6X2J1cywKLSAgICAgICAgICAgICAgICAgICAgICByYzQw MzBfZG1hICoqZG1hcywKLSAgICAgICAgICAgICAgICAgICAgICByYzQwMzBfZG1hX2Z1bmN0 aW9uICpkbWFfcmVhZCwgcmM0MDMwX2RtYV9mdW5jdGlvbiAqZG1hX3dyaXRlKTsKK3ZvaWQg cmM0MDMwX2RtYV9tZW1vcnlfcncodm9pZCAqb3BhcXVlLCB0YXJnZXRfcGh5c19hZGRyX3Qg YWRkciwgdWludDhfdCAqYnVmLCBpbnQgbGVuLCBpbnQgaXNfd3JpdGUpOwordm9pZCByYzQw MzBfZG1hX3JlYWQodm9pZCAqZG1hLCB1aW50OF90ICpidWYsIGludCBsZW4pOwordm9pZCBy YzQwMzBfZG1hX3dyaXRlKHZvaWQgKmRtYSwgdWludDhfdCAqYnVmLCBpbnQgbGVuKTsKIAor dm9pZCAqcmM0MDMwX2luaXQocWVtdV9pcnEgdGltZXIsIHFlbXVfaXJxIGphenpfYnVzLAor ICAgICAgICAgICAgICAgICAgcWVtdV9pcnEgKippcnFzLCByYzQwMzBfZG1hICoqZG1hcyk7 CisKICNlbmRpZgpJbmRleDogbWlwc19qYXp6LmMNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBtaXBz X2phenouYwkocmV2aXNpb24gNzA2NykNCisrKyBtaXBzX2phenouYwkod29ya2luZyBjb3B5 KQ0KQEAgLTEzMyw3ICsxMzMsNyBAQA0KICAgICBDUFVTdGF0ZSAqZW52OwogICAgIHFlbXVf aXJxICpyYzQwMzAsICppODI1OTsKICAgICByYzQwMzBfZG1hICpkbWFzOwotICAgIHJjNDAz MF9kbWFfZnVuY3Rpb24gZG1hX3JlYWQsIGRtYV93cml0ZTsKKyAgICB2b2lkKiByYzQwMzBf b3BhcXVlOwogICAgIHZvaWQgKnNjc2lfaGJhOwogICAgIGludCBoZDsKICAgICBpbnQgc19y dGMsIHNfZG1hX2R1bW15OwpAQCAtMTg1LDggKzE4NSw3IEBADQogICAgIGNwdV9taXBzX2Ns b2NrX2luaXQoZW52KTsKIAogICAgIC8qIENoaXBzZXQgKi8KLSAgICByYzQwMzAgPSByYzQw MzBfaW5pdChlbnYtPmlycVs2XSwgZW52LT5pcnFbM10sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgJmRtYXMsICZkbWFfcmVhZCwgJmRtYV93cml0ZSk7CisgICAgcmM0MDMwX29wYXF1 ZSA9IHJjNDAzMF9pbml0KGVudi0+aXJxWzZdLCBlbnYtPmlycVszXSwgJnJjNDAzMCwgJmRt YXMpOwogICAgIHNfZG1hX2R1bW15ID0gY3B1X3JlZ2lzdGVyX2lvX21lbW9yeSgwLCBkbWFf ZHVtbXlfcmVhZCwgZG1hX2R1bW15X3dyaXRlLCBOVUxMKTsKICAgICBjcHVfcmVnaXN0ZXJf cGh5c2ljYWxfbWVtb3J5KDB4ODAwMGQwMDAsIDB4MDAwMDEwMDAsIHNfZG1hX2R1bW15KTsK IApAQCAtMjE3LDcgKzIxNiw3IEBADQogCiAgICAgLyogU0NTSSBhZGFwdGVyICovCiAgICAg c2NzaV9oYmEgPSBlc3BfaW5pdCgweDgwMDAyMDAwLCAwLAotICAgICAgICAgICAgICAgICAg ICAgICAgZG1hX3JlYWQsIGRtYV93cml0ZSwgZG1hc1swXSwKKyAgICAgICAgICAgICAgICAg ICAgICAgIHJjNDAzMF9kbWFfcmVhZCwgcmM0MDMwX2RtYV93cml0ZSwgZG1hc1swXSwKICAg ICAgICAgICAgICAgICAgICAgICAgIHJjNDAzMFs1XSwgJmVzcF9yZXNldCk7CiAgICAgZm9y IChuID0gMDsgbiA8IEVTUF9NQVhfREVWUzsgbisrKSB7CiAgICAgICAgIGhkID0gZHJpdmVf Z2V0X2luZGV4KElGX1NDU0ksIDAsIG4pOwpJbmRleDogcmM0MDMwLmMNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSByYzQwMzAuYwkocmV2aXNpb24gNzA2NykNCisrKyByYzQwMzAuYwkod29ya2lu ZyBjb3B5KQ0KQEAgLTY3NSw3ICs2NzUsNyBAQA0KICAgICBxZW11X3B1dF9iZTMyKGYsIHMt Pml0cik7CiB9CiAKLXN0YXRpYyB2b2lkIHJjNDAzMF9kbWFfbWVtb3J5X3J3KHZvaWQgKm9w YXF1ZSwgdGFyZ2V0X3BoeXNfYWRkcl90IGFkZHIsIHVpbnQ4X3QgKmJ1ZiwgaW50IGxlbiwg aW50IGlzX3dyaXRlKQordm9pZCByYzQwMzBfZG1hX21lbW9yeV9ydyh2b2lkICpvcGFxdWUs IHRhcmdldF9waHlzX2FkZHJfdCBhZGRyLCB1aW50OF90ICpidWYsIGludCBsZW4sIGludCBp c193cml0ZSkKIHsKICAgICByYzQwMzBTdGF0ZSAqcyA9IG9wYXF1ZTsKICAgICB0YXJnZXRf cGh5c19hZGRyX3QgZW50cnlfYWRkcjsKQEAgLTc2NiwxMyArNzY2LDEzIEBADQogICAgIGlu dCBuOwogfTsKIAotc3RhdGljIHZvaWQgcmM0MDMwX2RtYV9yZWFkKHZvaWQgKmRtYSwgdWlu dDhfdCAqYnVmLCBpbnQgbGVuKQordm9pZCByYzQwMzBfZG1hX3JlYWQodm9pZCAqZG1hLCB1 aW50OF90ICpidWYsIGludCBsZW4pCiB7CiAgICAgcmM0MDMwX2RtYSBzID0gZG1hOwogICAg IHJjNDAzMF9kb19kbWEocy0+b3BhcXVlLCBzLT5uLCBidWYsIGxlbiwgMCk7CiB9CiAKLXN0 YXRpYyB2b2lkIHJjNDAzMF9kbWFfd3JpdGUodm9pZCAqZG1hLCB1aW50OF90ICpidWYsIGlu dCBsZW4pCit2b2lkIHJjNDAzMF9kbWFfd3JpdGUodm9pZCAqZG1hLCB1aW50OF90ICpidWYs IGludCBsZW4pCiB7CiAgICAgcmM0MDMwX2RtYSBzID0gZG1hOwogICAgIHJjNDAzMF9kb19k bWEocy0+b3BhcXVlLCBzLT5uLCBidWYsIGxlbiwgMSk7CkBAIC03OTUsMTggKzc5NSwxNiBA QA0KICAgICByZXR1cm4gczsKIH0KIAotcWVtdV9pcnEgKnJjNDAzMF9pbml0KHFlbXVfaXJx IHRpbWVyLCBxZW11X2lycSBqYXp6X2J1cywKLSAgICAgICAgICAgICAgICAgICAgICByYzQw MzBfZG1hICoqZG1hcywKLSAgICAgICAgICAgICAgICAgICAgICByYzQwMzBfZG1hX2Z1bmN0 aW9uICpkbWFfcmVhZCwgcmM0MDMwX2RtYV9mdW5jdGlvbiAqZG1hX3dyaXRlKQordm9pZCAq cmM0MDMwX2luaXQocWVtdV9pcnEgdGltZXIsIHFlbXVfaXJxIGphenpfYnVzLAorICAgICAg ICAgICAgICAgICAgcWVtdV9pcnEgKippcnFzLCByYzQwMzBfZG1hICoqZG1hcykKIHsKICAg ICByYzQwMzBTdGF0ZSAqczsKICAgICBpbnQgc19jaGlwc2V0LCBzX2phenppbzsKIAogICAg IHMgPSBxZW11X21hbGxvY3ooc2l6ZW9mKHJjNDAzMFN0YXRlKSk7CiAKKyAgICAqaXJxcyA9 IHFlbXVfYWxsb2NhdGVfaXJxcyhyYzQwMzBfaXJxX2phenpfcmVxdWVzdCwgcywgMTYpOwog ICAgICpkbWFzID0gcmM0MDMwX2FsbG9jYXRlX2RtYXMocywgNCk7Ci0gICAgKmRtYV9yZWFk ID0gcmM0MDMwX2RtYV9yZWFkOwotICAgICpkbWFfd3JpdGUgPSByYzQwMzBfZG1hX3dyaXRl OwogCiAgICAgcy0+cGVyaW9kaWNfdGltZXIgPSBxZW11X25ld190aW1lcih2bV9jbG9jaywg cmM0MDMwX3BlcmlvZGljX3RpbWVyLCBzKTsKICAgICBzLT50aW1lcl9pcnEgPSB0aW1lcjsK QEAgLTgyMSw1ICs4MTksNSBAQA0KICAgICBzX2phenppbyA9IGNwdV9yZWdpc3Rlcl9pb19t ZW1vcnkoMCwgamF6emlvX3JlYWQsIGphenppb193cml0ZSwgcyk7CiAgICAgY3B1X3JlZ2lz dGVyX3BoeXNpY2FsX21lbW9yeSgweGYwMDAwMDAwLCAweDAwMDAxMDAwLCBzX2phenppbyk7 CiAKLSAgICByZXR1cm4gcWVtdV9hbGxvY2F0ZV9pcnFzKHJjNDAzMF9pcnFfamF6el9yZXF1 ZXN0LCBzLCAxNik7CisgICAgcmV0dXJuIHM7CiB9Cg== --------------030801090008090204070304--