From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E651B81B3E for ; Tue, 10 Jan 2017 15:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GAje59fHHDdUqo/yiqvkVzcu+STX3G3MZRZ7ROKxPkU=; b=LWamt033cRRvpMfj1BK+Wac48IVa9o9NS6Ya8EJ6T/Af4U7ez36WBi3jacf3q2V5nf05icMXBmQSWvR7xxu6HJEqsjJ7GIAWPyWLAnK+do2AVj9hPIJQnrT4u8Urw6OncoQSpp9osVsTo6aTGWL3BFSUf9S0lDWm0xArZYbcK6I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by MWHPR12MB1247.namprd12.prod.outlook.com (10.169.205.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Tue, 10 Jan 2017 23:56:20 +0000 From: Leo Duran To: CC: , , , , , , Leo Duran Date: Tue, 10 Jan 2017 17:55:53 -0600 Message-ID: <1484092554-26224-8-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484092554-26224-1-git-send-email-leo.duran@amd.com> References: <1484092554-26224-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR15CA0019.namprd15.prod.outlook.com (10.172.204.157) To MWHPR12MB1247.namprd12.prod.outlook.com (10.169.205.7) X-MS-Office365-Filtering-Correlation-Id: 9eee0b4b-2e60-4d7b-aa18-08d439b44740 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:MWHPR12MB1247; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 3:Qdy8cmM6MwK2s7bFqoqyAaMzedDAgoFKZPUC2zCo2G0SPqdx9pPCZtDgiBs8+XrxG8TY8Ejw0valu5zVZbZ5vio3pPL466AgJn8L+pg37QsKEaXKo4VlG/7zwkyQR54MQ2h+/lgX5hD3PnZKx68n8oHnXRBg8otMe1CysR62sDRTaSCV2YCxrKEU1214Nzj/l8cymZhxBwWFIBfDAKFlFul0ac9AnRSkCyxtEQBK84UF9BwAlFUzcsIL2HIq4eHBAcjJLsh416hqKUU7ZVpRZg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 25:+4UB3BffFCLhJfP7CO1n4/IzfOMqBJfkVP+BBNCSHGGPw9OO84cYawr2+Y/wyqT4ColQZMnTyNy5f0yz8Mz4BmWO8a1cSwAcUpPzJGrcmflKSuwH+No8Ppzt8tkwntrCltw+gxapUEFpJe48wV9CNXjZYkh590hHk6MYc0fdvOoYzBKtXO/og2iSZy5Ud9ObDuIitR0FUHly+L4trksf1EWG2mWDRiryj+XZCpwniAuMeGc+cfn8AQJm8IvTcK2lRhZQH8OjsQFJPc9nd1yvnJU9en8GJOp+9uak7UWFLJXtlcxgjgCFgi/YCJDkwEoy+pUkHm3kBadxgPZztX2x60WK+KIq59zx79/XBeB9buCDJng8+WVyLUd/nizMlwLdC3usbLYnRz4I7Q/oTHakDjc6WnHbI8+XQDgA7Vgrhe7X1YyOR9DDEYCNTbzEvYLeTVDH2ToAhXN/vAciZ2vaOhaKfl30rjnaVtpJv4rM0qAZgzyvXLshH+lQ8GnhrOLKkZcuiS/7lvRXT6tbjVdZY6IzJo99YvOONU1M9CIsDFbONzD5dl8tSGm9VO4aNwZx/+JYmpgmjrVTkmwZ9gkO2p3T6isi0f+4FMfFShMU4e99LKBhruI+IOt8YBNPD8WBwWQsB7dh4ZbZjclbyjxLLnaP/xYiXPT2/Tb3ZFwRb5TJweAYN3DKZybqKhWkeMp5ycd4lcpYB3V3HhBQ0NgPXSFxbAjs70//ZwFp1MS5xeC2sYLKkYWB2cxnas2uAEO8vpWRDifxHf2eqgCNCyLag07NZQ08SGmk1Xb53JxSXEp9E5wtTPGBYoJ1ipAvUgrrznFCq/9prACCvmLqohI+LA== X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 31:A1HiDZ0joLwYk20l4gUgcaqhUPTcDqfXzelR4vaL01v8G5iGVtxp+F4IFQb2ahsBdm6aKTPWPEK6bGARs9UcUHtAhZYIKoeECZnfstkGZYC1wlie2XVweYlKcZtUJT0HvUinY8N5hqd321eQ+uXITsH1vD0VGIJc36S3EW0WCw1AcbG7IcYoeL6Hkpk/4eGzjLFAk5nbRVHiP85XNyVPO8S1raJEQ9ACbYc6b1xpt5mQL6/Ue2x0VsS8ecPFEq+l; 20:uYhusGQwCDx0s/3RUco7KRoG0pu56AtMK1Y+GnHhQPm1shQE7q2Rccw1wvkpw4AtJd3sOWpQP370RvVb7l2u+xGnqEihh+V9zCVKuABsrGnXzCb7QLH0ky61HwhCfWdnhiBEbqMgmspErOEihhdN3d6seawLq03uFddAULWh6IYaAQwQAfxVp3c26EvQN5L2uE38C61F9yfleiH4wwHse48dXe18Kn5imz04gvBIbbSUXeBjiP0jKNK/jwwYN/C2SjOogAAxVcZDb6K1Hscnyd8esJPkcG9uf3cvaIswSVyQ00xQuYKKDLH+qCd76pS1EVDtrJ9ujTL0MqqCvJiuLgGUZFYYsqpRuLHPOk0qxKz/uZqJO0Qm0yH07tmPM3D1ZTLCMUvezrVHcsKlSUsnjnfKdDXAdDkBGW1o2k7sSDpk63KjEi64jALouRf3wh/Us09FIcLj+X1FKreDsVCFX4dYH/Y59fJP0iIfnBQmZqCnCMHyRUTQZIOMXsi9ADWk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:MWHPR12MB1247; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1247; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 4:HCNfasZ7znuswHEayCdBJFR8TYMIBWHicAiMPjJtCWTapSkq2RULtXqM6nlaXBuioRAPURcjCe0laGwsrXK1Owz7AwV032f894OUKaRxIy2l1mG2nuXlrXBaE9dTqXASjBCmR6um/978OJze10sgg7nhPTytXG1n9fsoEoUvLNs69j82MY0/yIWk7omiBjY8aWWn/Mm/iBcK04J7j1x/EEDYG2nCI88PbUAoi+uvrBDsBx+ejPpmL4xmOADCDF2PfwbdnfZ9KfnagzWsh/uMSr7S+TH5Fzw2hpuZuArU3VEZXccMSs7EJba/nRPrrq0WK72koKcpbk2xPzNb9Y53XEazE1vk38U6fnJqdEJA4OL2jrQnlouVhV5T7lKDK9o4iJ+/NUU/06QlZ3cMAT5ziLRC4iceRHDBWvyoXzgC+UbupSyBjJ2XD0eUwgmCrgP95DfbyAr4emean+DKxMNJkiGb8761rDYrjAM5aTrtqPZ5Nxbb6SIvOYrEh20CFR9I6DCSmSgqmIIOPsP46ROVxAEfXJaeeHKd4sVAD746CaHyfgxWLf+Aa8bBZsQE3HCrRMpR/K2TrL8gB8yhlUcofI4GHOV6S0oBVIwE4WIUvmztsgBp0Q3CNu4M3kmw1Ce8KVgNIpXqgTDaGfDyFfaV5Y5rytDymQhH196D/14tVEA= X-Forefront-PRVS: 01834E39B7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6029001)(7916002)(39860400002)(39840400002)(39450400003)(39410400002)(39850400002)(189002)(199003)(105586002)(33646002)(101416001)(97736004)(92566002)(3846002)(189998001)(7736002)(305945005)(5660300001)(50466002)(50226002)(6116002)(48376002)(8676002)(6666003)(81166006)(15395725005)(81156014)(68736007)(2950100002)(110136003)(6306002)(16799955002)(106356001)(2906002)(25786008)(47776003)(38730400001)(5003940100001)(42186005)(53416004)(54906002)(6916009)(6486002)(4326007)(15188155005)(76176999)(66066001)(2351001)(575784001)(36756003)(86362001)(50986999)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1247; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR12MB1247; 23:gc+pGSAjqMYNQg2HTQFSNLK3BsGfJKQr8sWX3h7m1?= =?us-ascii?Q?q8DAPLkGgYcWpgYP9alxECws6XeHTMdQuHy5aX8GDVeN4d/x3xaR61spVkXm?= =?us-ascii?Q?osCIVYMTBGAFv1HPXTTh6w5Sippeu9+r4YeQRPrNkAJl5ueFsCH8Bs6RHPkf?= =?us-ascii?Q?/RpLGNQ4AKjZC0T1MdKMFZi+WhgwMw2YWnxDAk8JIYZ72tM+J9/uDDFhCtcA?= =?us-ascii?Q?5usqXGsWWHzsk2GH9OsfprWkXk3Ros6LRptP2SxOISqhd5POmKcGLpzfQU3b?= =?us-ascii?Q?jfGPbf582W/u+rGbyoBkpuRkiiMtsN9YbD12ud1Qgke+cYIRsn+aQGIRexMO?= =?us-ascii?Q?MH6I3G0ZmXL1nPIqUrr5EatihwR75Hukli0xQtCtImkhOrIuVySmiWe8qcwQ?= =?us-ascii?Q?4JAQzJynh3lYHxaWwvE1bnThYjrXK/UfBle0uKIjTBwQ4XiA5t8ugaa9/8j5?= =?us-ascii?Q?hsYdSfSk+0y1k3+9zBn5YZRdGhhoAGk6MqHXjLxIOqPF/jo7ViT/S6UXFkVr?= =?us-ascii?Q?wKzX1fS2EMee/Io9d4gCrRPzgJqrPoGCdAwEiI/DRwOR5BbRnrKgtI+635j9?= =?us-ascii?Q?db32nWUWNMBc9lC0KtEU9EoOyxYUWyYs2hvUmNBPT0WM3+riF5f2X/VMUaeu?= =?us-ascii?Q?k8ivAYb+48In4BdmJbneilLmQuXaTVFe9jcrkRfU2kHzaoVGOogge4p8LNvI?= =?us-ascii?Q?oPjRKHl1M+1Cb+9qdXNA8NgZAfzHBWGE10kfq6R6j4Zr8+ZrNnB1npS1sNNx?= =?us-ascii?Q?AkaQLht70hvkrnn3jqrJqHQmqXK3n+qAS83iMouAuz5Z7QIbMAfcknUGyNsC?= =?us-ascii?Q?01G6ht25cnQxPjUqd3Wj/kwWAqfaVcZYmH54zIVC+uCejHu/SUbD0gtFm1UW?= =?us-ascii?Q?X5eTjTBg/O5TrnZhxQs9z2Dsm51SRD0nzPl7tbK/IhwBSd8HjorBoXgZHZfb?= =?us-ascii?Q?G3rdfNP9wYaQf6tQFSxX7gebDGA9rdFfZ4HuVT4r6e577w404mB00QNutd5E?= =?us-ascii?Q?UNh2dp3gMOPeU53mxEPKE/Kl/zlMylV8QAmBrv6AitOPTfQuEMq2ebNaRKnU?= =?us-ascii?Q?FEwWYR/AGsEa403j1/XEcB+Rpiwc0dM7redvAdOZfbjyDVS0yGFADkKCo/lO?= =?us-ascii?Q?SqNQ2EEvZpU8JCwzElEOyMMb8GnlGT07A9IOyBYrYRMuTmWJGXE8IFSfcVwg?= =?us-ascii?Q?omAjJTs3gn+BghtidRNEdU8cIH4ymu92f6GGfHPBjSRSslbzcTfDch9sFXUb?= =?us-ascii?Q?cmNeViLnMIsp9RuxNr4sRDGM4s5c8ncd3tfcQ6uTKIKjpD5loBuvkbpGwYIR?= =?us-ascii?Q?f7PEztxOMTaXb8v02GQHG9ce/uWVjtXTAqN4vi0SP0r6ReabT0OVANnNRrH2?= =?us-ascii?Q?OEB6y3CDlebefV9F1ogFyXu6V4=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 6:VYQECAUwdAD53s7+oqkz7NYCsQMBvVeKbxS1SqytrxiSGsifVmBPFDgpZ/pmCqqWCIfHlvJunfIELccwR4/92Ms+/0UpJXNAGJZSvur7Q1CuUjIgzv3oxW6Gry3UTtV9nU/dqAhCOWDVIGSzMLxRbPguZinbswxt6jwJIh6N1S++7uQboaCQ/Ka2ijI4/Czg+0ApQVoOf8kHm9Dm85QuP7fXSAG5nPcKGNPsb3lXnLyp0F6XYysNDz3Cy8y/q7Yf8PeOzsrVQuzkBwweoJUndc67iYp0J8N58YBKOOpSFO1cq/pCpZ1YCXkRs+0ogdebD76G5w74ZivbNtpYT0UkctafQuLAdO+zFanQwSdVHALKhUkK/oXkSlUo4eNBP73BTlW5AVNbJorwwhILMcL1pndjkvSWJuccmpsyTDDxCBTZWqaPjETHg57H5NtzdLLAG2quh3MecrekLTCrEcwkFg==; 5:eARSTFp1CR/IZeK7xDDqOfgl4h3dQ7HZEcn0j1ZYUueERhonu4qU6fE7zx6XfL9y/cNnWMjZ5XGa9u8HSRkO9qqAOnhaIEH1BWb8Yjc5L42quy1Mu4+g7Zj5FtC1Em/Uom5MZshdkLPq4A/RVEcCLg==; 24:y4mLWDDjW4TLNSUqpBqSbfYOjYZ1mC3D04frJaAKPA4ZipM+sBQCHLQ1tHrIatF0kkfE0zsSMWmC66kMeg0M4gGzom+0RvjD8S4sumLG5pM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1247; 7:fTurhjVizo4VoM8bGH30jFO07b4IdHhaBCG6N5v1alSlRK/5zGswSyRDR0blQZsOfzWdCBNrOTvxlHUXmvwTrCOH6zQNX47SCl+iicX+wj6NZJ/vj/GfxhKeLKWYsaCN4pq276QgnGklesHzNYn1raxzph8S4gNvAVb1z1FS5rVrO+k6qtngmusnCu6+LiedBkkcA7Jr0b6w4EaWATWmBvrMyI7bTsXpOAm+Ll17s20UP32ZO8XQU6IymBZSTORBt6GSJS5bcJAuCLH1jumzC0LdeERquhDPjgAWoMJtlPuVDjib7axJp3rZfY28MJaMby5KIGL5BY5X/Tc71uOH8EFbWAqNuljwRIRKbufbKsrUOI7WNNo1bDSVwVCMI3IJgrNr+FWCUZNqVv5wuqPDhepVks8qWPxGxSe13KYkvJhyqQgrI+rVqyE6oI2gBOh1UJQzzTttrzoYatTsd5WuVA==; 20:s2DOOERPfZR83TK/NfCiQ8SSSwSbObm/5AuO7u7xYoVUMKYOFditWC4zswyHJFKhOOieCVaBfBzp/PaKHqxFLrc0E/p9NGjcCmUEesF/+U4e4fLwvhSZETrQekJvuGD1lqcestN0euIXvbOVg5+hN3liq9X66sBxFhtJmtrr2/yCFBvbW6N3tEFLVyQl6ckpV+cOfUWFFjGtnlBvwguPHgXOpru6LqVSsChLpZFhfBe0YqfqdZvZv+UqEbqEUdnb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2017 23:56:20.6279 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1247 Subject: [PATCH 7/8] UefiCpuPkg: Modify CpuIo2Dxe to use new IoLib class library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 23:56:24 -0000 Content-Type: text/plain The Fifo routines from the UefiCpuPkg/CpuIo2Dxe driver have been moved to the BaseIoLibIntrinsic (IoLib class) library. Cc: Jeff Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Signed-off-by: Leo Duran --- UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c | 3 +- UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf | 11 +-- UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm | 140 --------------------------- UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm | 136 -------------------------- UefiCpuPkg/CpuIo2Dxe/IoFifo.h | 176 ---------------------------------- UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm | 126 ------------------------ UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm | 125 ------------------------ 7 files changed, 4 insertions(+), 713 deletions(-) delete mode 100644 UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm delete mode 100644 UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm delete mode 100644 UefiCpuPkg/CpuIo2Dxe/IoFifo.h delete mode 100644 UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm delete mode 100644 UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c index 6ccfc40..30ed405 100644 --- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c +++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c @@ -2,6 +2,8 @@ Produces the CPU I/O 2 Protocol. Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -13,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ #include "CpuIo2Dxe.h" -#include "IoFifo.h" // // Handle for the CPU I/O 2 Protocol diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf index 920ede7..5503662 100644 --- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf +++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf @@ -2,6 +2,8 @@ # Produces the CPU I/O 2 Protocol by using the services of the I/O Library. # # Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.
+# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -30,15 +32,6 @@ [Defines] [Sources] CpuIo2Dxe.c CpuIo2Dxe.h - IoFifo.h - -[Sources.IA32] - Ia32/IoFifo.nasm - Ia32/IoFifo.asm - -[Sources.X64] - X64/IoFifo.nasm - X64/IoFifo.asm [Packages] MdePkg/MdePkg.dec diff --git a/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm b/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm deleted file mode 100644 index b1cc25e..0000000 --- a/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm +++ /dev/null @@ -1,140 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
-; -; This program and the accompanying materials are licensed and made available -; under the terms and conditions of the BSD License which accompanies this -; distribution. The full text of the license may be found at -; http://opensource.org/licenses/bsd-license.php. -; -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -; -;------------------------------------------------------------------------------ - - .586P - .model flat,C - .code - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoReadFifo8 PROC - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insb - pop edi - ret -IoReadFifo8 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo16 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoReadFifo16 PROC - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insw - pop edi - ret -IoReadFifo16 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo32 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoReadFifo32 PROC - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insd - pop edi - ret -IoReadFifo32 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoWriteFifo8 PROC - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsb - pop esi - ret -IoWriteFifo8 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo16 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoWriteFifo16 PROC - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsw - pop esi - ret -IoWriteFifo16 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo32 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -IoWriteFifo32 PROC - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsd - pop esi - ret -IoWriteFifo32 ENDP - - END - diff --git a/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm b/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm deleted file mode 100644 index daa90a9..0000000 --- a/UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm +++ /dev/null @@ -1,136 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
-; -; This program and the accompanying materials are licensed and made available -; under the terms and conditions of the BSD License which accompanies this -; distribution. The full text of the license may be found at -; http://opensource.org/licenses/bsd-license.php. -; -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -; -;------------------------------------------------------------------------------ - - SECTION .text - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo8) -ASM_PFX(IoReadFifo8): - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insb - pop edi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo16 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo16) -ASM_PFX(IoReadFifo16): - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insw - pop edi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo32 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo32) -ASM_PFX(IoReadFifo32): - push edi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov edi, [esp + 16] -rep insd - pop edi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo8) -ASM_PFX(IoWriteFifo8): - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsb - pop esi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo16 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo16) -ASM_PFX(IoWriteFifo16): - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsw - pop esi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo32 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo32) -ASM_PFX(IoWriteFifo32): - push esi - cld - mov dx, [esp + 8] - mov ecx, [esp + 12] - mov esi, [esp + 16] -rep outsd - pop esi - ret - diff --git a/UefiCpuPkg/CpuIo2Dxe/IoFifo.h b/UefiCpuPkg/CpuIo2Dxe/IoFifo.h deleted file mode 100644 index 9978f8b..0000000 --- a/UefiCpuPkg/CpuIo2Dxe/IoFifo.h +++ /dev/null @@ -1,176 +0,0 @@ -/** @file - I/O FIFO routines - - Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
- - This program and the accompanying materials are licensed and made available - under the terms and conditions of the BSD License which accompanies this - distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef _IO_FIFO_H_INCLUDED_ -#define _IO_FIFO_H_INCLUDED_ - -/** - Reads an 8-bit I/O port fifo into a block of memory. - - Reads the 8-bit I/O fifo port specified by Port. - - The port is read Count times, and the read data is - stored in the provided Buffer. - - This function must guarantee that all I/O read and write operations are - serialized. - - If 8-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to read. - @param Count The number of times to read I/O port. - @param Buffer The buffer to store the read data into. - -**/ -VOID -EFIAPI -IoReadFifo8 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Reads a 16-bit I/O port fifo into a block of memory. - - Reads the 16-bit I/O fifo port specified by Port. - - The port is read Count times, and the read data is - stored in the provided Buffer. - - This function must guarantee that all I/O read and write operations are - serialized. - - If 16-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to read. - @param Count The number of times to read I/O port. - @param Buffer The buffer to store the read data into. - -**/ -VOID -EFIAPI -IoReadFifo16 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Reads a 32-bit I/O port fifo into a block of memory. - - Reads the 32-bit I/O fifo port specified by Port. - - The port is read Count times, and the read data is - stored in the provided Buffer. - - This function must guarantee that all I/O read and write operations are - serialized. - - If 32-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to read. - @param Count The number of times to read I/O port. - @param Buffer The buffer to store the read data into. - -**/ -VOID -EFIAPI -IoReadFifo32 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Writes a block of memory into an 8-bit I/O port fifo. - - Writes the 8-bit I/O fifo port specified by Port. - - The port is written Count times, and the write data is - retrieved from the provided Buffer. - - This function must guarantee that all I/O write and write operations are - serialized. - - If 8-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to write. - @param Count The number of times to write I/O port. - @param Buffer The buffer to store the write data into. - -**/ -VOID -EFIAPI -IoWriteFifo8 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Writes a block of memory into a 16-bit I/O port fifo. - - Writes the 16-bit I/O fifo port specified by Port. - - The port is written Count times, and the write data is - retrieved from the provided Buffer. - - This function must guarantee that all I/O write and write operations are - serialized. - - If 16-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to write. - @param Count The number of times to write I/O port. - @param Buffer The buffer to store the write data into. - -**/ -VOID -EFIAPI -IoWriteFifo16 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Writes a block of memory into a 32-bit I/O port fifo. - - Writes the 32-bit I/O fifo port specified by Port. - - The port is written Count times, and the write data is - retrieved from the provided Buffer. - - This function must guarantee that all I/O write and write operations are - serialized. - - If 32-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to write. - @param Count The number of times to write I/O port. - @param Buffer The buffer to store the write data into. - -**/ -VOID -EFIAPI -IoWriteFifo32 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -#endif - diff --git a/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm b/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm deleted file mode 100644 index 1a3f0ef..0000000 --- a/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm +++ /dev/null @@ -1,126 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
-; -; This program and the accompanying materials are licensed and made available -; under the terms and conditions of the BSD License which accompanies this -; distribution. The full text of the license may be found at -; http://opensource.org/licenses/bsd-license.php. -; -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -; -;------------------------------------------------------------------------------ - - .code - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoReadFifo8 PROC - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insb - mov rdi, r8 ; restore rdi - ret -IoReadFifo8 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo16 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoReadFifo16 PROC - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insw - mov rdi, r8 ; restore rdi - ret -IoReadFifo16 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo32 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoReadFifo32 PROC - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insd - mov rdi, r8 ; restore rdi - ret -IoReadFifo32 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoWriteFifo8 PROC - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsb - mov rsi, r8 ; restore rsi - ret -IoWriteFifo8 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo16 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoWriteFifo16 PROC - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsw - mov rsi, r8 ; restore rsi - ret -IoWriteFifo16 ENDP - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo32 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -IoWriteFifo32 PROC - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsd - mov rsi, r8 ; restore rsi - ret -IoWriteFifo32 ENDP - - END - diff --git a/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm b/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm deleted file mode 100644 index bb3d1da..0000000 --- a/UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm +++ /dev/null @@ -1,125 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
-; -; This program and the accompanying materials are licensed and made available -; under the terms and conditions of the BSD License which accompanies this -; distribution. The full text of the license may be found at -; http://opensource.org/licenses/bsd-license.php. -; -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -; -;------------------------------------------------------------------------------ - - DEFAULT REL - SECTION .text - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo8) -ASM_PFX(IoReadFifo8): - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insb - mov rdi, r8 ; restore rdi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo16 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo16) -ASM_PFX(IoReadFifo16): - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insw - mov rdi, r8 ; restore rdi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo32 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo32) -ASM_PFX(IoReadFifo32): - cld - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insd - mov rdi, r8 ; restore rdi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo8) -ASM_PFX(IoWriteFifo8): - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsb - mov rsi, r8 ; restore rsi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo16 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo16) -ASM_PFX(IoWriteFifo16): - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsw - mov rsi, r8 ; restore rsi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo32 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo32) -ASM_PFX(IoWriteFifo32): - cld - xchg rcx, rdx - xchg rsi, r8 ; rsi: buffer address; r8: save rsi -rep outsd - mov rsi, r8 ; restore rsi - ret - -- 1.9.1