From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe41::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E02F08193F for ; Wed, 4 Jan 2017 15:08:09 -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=e3P6CWjuzg0PfnqdK2MFjtOQoz3FVuYa9lVjVfEr4tA=; b=mG0qyxa7bj5rHJRhQPmkZNsrHr0Ch2QFKV6Me6POWK4Fl+RjH3dopDBDPoQyQCAHM6AcRgR2+Kxi46e/DkDYMA3aGEapGxzQ4255NueKPhy8x8wvmlK+zEc3xT8RzOiv8gK+e1ndbVQac1Yjp3+rHHbgwgQsTqitRa26ifyBHxQ= 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 CY4PR12MB1237.namprd12.prod.outlook.com (10.168.167.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Wed, 4 Jan 2017 23:08:08 +0000 From: Leo Duran To: CC: , , , , , Leo Duran Date: Wed, 4 Jan 2017 17:07:52 -0600 Message-ID: <1483571273-11187-4-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483571273-11187-1-git-send-email-leo.duran@amd.com> References: <1483571273-11187-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY1PR08CA0011.namprd08.prod.outlook.com (10.163.94.149) To CY4PR12MB1237.namprd12.prod.outlook.com (10.168.167.12) X-MS-Office365-Filtering-Correlation-Id: 9cde091a-56c8-4399-7100-08d434f68c24 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR12MB1237; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 3:v7VM86rbZ0ZagZbM34yb7tXt85Cki+kLYn/5/XAMN8ZAL7vJuJhmd4zGyGdDfWtZn2pbgcHWmBgLs5Tc4/xDdqJfXD8DHVATTivVpRlPY6vLaI/gSjbT72Zjt/vdV1P9ZV7gPTqgIcuv9lqo8m9c7DQNdvnn7NovQbVrFJUrxmDBcAoqXg8WuJpPCX/ccy4p3jU/1ZgMvEXRireII5wvPWwHyNOfBsUq8180aywHC21SgLimF8Kzd5tpVvlYXv5QIaHun3+RAQhopeXndZGauQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 25:QR11T5soT+G3YHmKV5bsNo28FilFrlNyllpiTZTpRuaxbT5RRyn3eXBVtCNwyxof+OxzmxXvZgkFJcDugHZYPMvIXn9mMC4HT/MhQFanvnD56bIYUCkiepXT8hflgERUiwoY10BbUoqmOCqRqk0OEmWuLqEBO6IcakNJzk2ozQDFxaJrah/byuicI2jfAg5oRNgbOWRTPvQZP6SWH2mfakiY4yaOX6D9+qxxIqbjxroCUx0tXpupcIZB8ig6+du0UzZ9c/uPl02ScpM1EPW/ibACwq1p+kGdhKdeYzpm1H3VSI5BGBDlEbS43SBQF0WxioSzqOC2BUDu/RqU3kx/vcYnqV0eifekSkT4s/sXFEQHDM1mLd08wgFFSvEV2ePHbj4ou8Evpe4RqwDWtTBjgz0g9rOYLSvbmTP6iOXl8OIOrf8PjQ5wH+V5FIbk9/8WygTZaLzO4Gj7Y/JrGgqIHHWg60NS8e7mRmZ1IctYEh7aFYTWZJPuzahD5nWAnvaGRkqJc0Dq/XBcVG5W42/m5Dri+cRgNalJLSiqq2uxcbnj7aR1y7eH/uLzROIhhkRIG9CGcwNqC6SjaRaeoLSE+gf1fU6w6MaOoOJlOdIsoA3HBKhps3J+Tc04e85EBjhCRaHa/DFWHA7bbn2/3+ZYiVEhieozV+OgdahAW0n5J2Ks9kqUpHR+arD7tKtNSp5rNmmIHnDMh1mrZHgWImnKX9hEyKLeJz/ugKaF0c2v0Ee9mwXG7avBjcw9OEkN+gRYGfnC2bc/xIYTTqGcWH6cXWWyEzLteFsxlocGlrS220Zbn3s7ddGNB4trZc/++Z+T X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 31:gPGHpSqFC68uXIhtak7XWp0RpDF8Yf9FZE+h/yqwqye5tVbVf7kPMEd4H60QX5kLFubW8cePFRsJsZpBBe5oRfW2/yX06XSMMMXEYCBnI/mNzDyBqfYIfLV08cdSESHwESKF2vAgI2gSKtXLKwiNgy8oHC8W2QTAy2CN86nZVFyv0szlXT+H7HImaGA8NUVbSFVw6HnjkrjUkBgqVFuAgTkK9D1aOJMQKSN0fgtO3r+ndCLNfA1N28ydjnbczkbts/bQ7BlZa20aVkS1DJvroA==; 20:e+4p3anFUdu56e6avANfzk3aHJQNi+x0xlcSLJ1fUY9HRboKqWu+4GooVAJzOKKclSTmnZygRDHO3DRTKYymlr4gZdm+9gCJx1uR09KJjN14YpQL78OayQnAxQETGKa6vTLswk4cJALnRONef/WSYE3FAjPoWcnMI0oZTJwm5D3rJRld0sb5rC+jKI9DKIlSebMKAk8lM6uCJLqU8o81vNL6wDUhhGREyIUiW4zoSXs2ll8HZG0i2ZHH1Ap0uZMZQqETmdHdofPBc3wTUi8Zp6kUTUW3KoIe21SL3woU9xryWWPwKTsLPRe3uPvlfqdAfrzOsnLPtGy2CYMF6mPnpTmXkdMtMR05HvcxjI+U+gmgbuGOKhotbENtRjYd7N+m8TAQUS2oUAgi0Tb08PA6MPaJX0jvY20jCPysk40+ESZrCwykDzg/K/rs19APoywoXat2H0mDumU3P37rH5nMjFrHl16JxEGwJeKS3iN2eMT7pwmJTecx0+Oxhu6epcR8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(20161123558021)(6072148); SRVR:CY4PR12MB1237; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1237; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 4:JsJwYFPThjlSLTh+Jd9ScvBcMAAeoo1CAXlbpdPDXARtaxCCGlv/DZZ7TSlccYBeirG22DMhFbfYjT5qm4OSyOho21XZHsBCO0Dh4WTMkR/ReXBcoLH+WzxvfXAp6X5qjCBSNRzbqRwiAXZvsNEChA7wWtmLS/OsBiGX+9L7EWhonk0+Uq/DjMJL9hA0r35vep9jcZoHLhhygG+/aEshuNF7LOpbvg8bJHhVNAUuW02QOaTpPxUjqt9M10tcZU98tkuox93AVio2OWwKb7FUS8yAJfcOoiT2QE45yxNmrYaiTlvTH4fHjnpS2qN1RnBwA/yZr479ZbbsG5DfxWFIUMCdCTcp2eM16cveUBIBE2Eg3CONyjEN9mb5xVXCgyPcxVIZBpskUkcpczzhNTPa81JvvputuTzhuIEZqSzCunK3b/xPC6cRY67yUNOua0XCfh/M7o6uH+rLjrUsuZrYpiwbg7uNSigMdR7mhbvbjKH5sf2KZOw1QP9k6AGGYt/wUHOCf2s8myRgM3m215fWLRsxxVNk3CDT8n8rEmCUcCaQP+7s9msXpMJKSY7VmfkYOUZaDHNSdSOfWEcZLw5iOUWdj7sScNQCPX4Lkw33A9fnRurWwzyPo/57rai0lXh9Vrfmk3vAintTF+5yEYPML6cVUjIVGw4KUtZcvobXX5k= X-Forefront-PRVS: 0177904E6B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6029001)(7916002)(39860400002)(39840400002)(39410400002)(39450400003)(39850400002)(189002)(199003)(6666003)(66066001)(48376002)(2351001)(5003940100001)(105586002)(189998001)(92566002)(50226002)(5660300001)(50466002)(54906002)(53416004)(97736004)(42186005)(25786008)(6486002)(6116002)(8676002)(47776003)(106356001)(38730400001)(101416001)(4326007)(2906002)(15395725005)(50986999)(81156014)(76176999)(2950100002)(81166006)(575784001)(110136003)(68736007)(305945005)(86362001)(3846002)(7736002)(36756003)(33646002)(6916009)(6306002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1237; 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; CY4PR12MB1237; 23:L8FQLTjetEL8SRH5bdXtgaZ6yYH8DY/RjD+fKe43o?= =?us-ascii?Q?dExihfkXDDE3PBPPaomD7uz8hZpkUsZppusijt5DTD/MgfoWUZCRfd55ySwR?= =?us-ascii?Q?d//57FAq6twzYzi7F8fb9oZZABgUbmBbFpufirBKmJ1XzhxFpGuOy2l3jcFr?= =?us-ascii?Q?79DdOchjnzVf68Kg/dW78XQzyG/SZxunbj34bUvu20XzZrkpjjViX1jPQjwW?= =?us-ascii?Q?aB1whLkUITt+zi05AeMYRLdFuwWc8lXKqZR9UY7R46JngAh5nPqbYLMpgNvs?= =?us-ascii?Q?dCGVh0EZA0NguptxoB7lhNdfpwEX07k8dEcFRdoG7OYsSEmYs3WGlJAy9ORR?= =?us-ascii?Q?NUtFHuXMRCaUuL1OYk+Ikcg321BxHg+Zq1vNSOuartJOePTz/ZJtR+pj7gFP?= =?us-ascii?Q?4VGq8jP6cHxxeUwR+ISxBBSIXVK/zWMkNhyOmMotb6nwxevAYw4U1eVxyGzS?= =?us-ascii?Q?o3aosq9A3lEdh1tLxiSNl9QlXAdSD2ZXtqPzqidkUIomqxQFsISK00XIA7vV?= =?us-ascii?Q?NK1QPIQtyxBgeSDpVGhioD8gwwcE/DWxj/bYuLTBH84JIHDvI8oZ/8nhIrVv?= =?us-ascii?Q?213PUUj0PmySs7J9JuUlvHV3NxVI6D2W3xiW/45NSJmMa6GX60hnVDNlUcTT?= =?us-ascii?Q?oOb9utxBo2aJlZtF41ONON9M3/4G0SWTzBzXpSwU4nHgr1uYh9qFqs8ylgfg?= =?us-ascii?Q?I8no4Iy/G3YfTbnwHnmQqqPcjvI/XXcz9y0gzr5VGmuWS/jMieGc+HPe5Gs7?= =?us-ascii?Q?7sumNIsVx1IWK7PweNQj97eIruiB+qc0M4bo6Xmlp07RIqYYsrVT3RaqTizu?= =?us-ascii?Q?rBXAf57LpJtv4Ixoqa+uduBYrgh78j5vS3Kf7oSj3XwSXjS4HNmbSbxbaCh5?= =?us-ascii?Q?fva++01iu5XwzANMTo5Q4kPozD7FaKE9r69/RWON46mq5HTiN/cZhgtf0f67?= =?us-ascii?Q?9utFLzRTo0dlAJYvH4rdogbS3qfcU7uoePV1A71lSreEbnKl4k+jveZx0DNW?= =?us-ascii?Q?x+nR0Q5Rm9IHkm2fxPSAQh9sA2Y1/DwFJsa+4U9bvnOssoO1dd/y9InKh/+d?= =?us-ascii?Q?5Crf7ipb8At4aZMM7mGslYIKfB6T5TYkE5a9YxK5mE1AeKnmjlFdngn+BQOD?= =?us-ascii?Q?idzzFEJYDAN89rpTuCX4cW0ig1ViTbNHe2DfO3kgl/uIWpqJBGoHIcKuhayV?= =?us-ascii?Q?M6SUIH+P9yLc0grwGdeAoKdStt+8Phzt0pOFYeP8KacdRebrOX19R8ANk2AS?= =?us-ascii?Q?pyejlETDSgp367XwqfucmwohIvrTKsdsmI+QdKybVNu0Pbnc2IQ6r+lWB/yT?= =?us-ascii?Q?2j7jkUDnHdmlzST8v4iqH4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 6:fV5iQmPKsvNvYY+yRdht3+7plKpFFl0Sa3UArTvsV/hMivVPE7czfD/Qwr1SBreVnKHpEJCa5yHtpv9sX298vMrEGnZozRMkZvupfKTht91sv+/m557ninAUmoiwuT05VzmnQ520a+GIEXDnK6OSVFLFxBtaG254lP2sAlmQrHGyRfL4yX3Y3RHfXFb2NeyfGaP/8FXvEO3dZOswNUWu4VBhW6tmrklObr1Ec8UjVKpGZvynJ+qKO7s0A1A8gfbEEr2TlArwKCkw/amtZqANngKn2ciN1qcVOONE6bhLSpYNbdgblQaW/6h9g4uscyHYYcSVqamE4klc2sGN8g1qEQG9vuYI66bGv77ewUjdGXdNwnqML1C3zEC0gfq4IfCo6Tsn5Sww9ZhZS/MgpXAkBLdqjokbRvrTWpkRoBCAaaRiMqw4BaMd0SX9MQJmm3qVNBCc9zKGSztVXu/ytCS6ng==; 5:NdhgqwCqFIN/c/O/gyfSQPJCsnWcUEMSqXolOuGcJZXFmOjEXwmoGoirGcL0H6RdNWvyKhOmBOwhhrQ3XJRWfZ38g6yrC0vC5gHarTpXw6zGqgHv90uyCWwJ0iIb09DV/M3zLyS08nVIa72HyCGvFO2RwhRJFh7qZmvo1IK2HDg=; 24:cF+0OMzTORh+XETdYwaoHWLtiST9gt7PTbMcV32MRTjU2o1FDSRi5P/C1bu2v03USHUl/zAk8/gP+OP41TcOI2R3f2obIKcK+2d1h/uwK/4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1237; 7:+x0kc4WwgRvN6RdNiPfNYn1u/3t+2m7Fi6zICvJW5BYLR/QXfYZTWgC5fB87HUAU6pKTuW82fhJqiV2dgCcTqhBBgjiWBQfv/A3lBXCcT/p7fI/8wHSNKofIaxqYz2S3xL4QzTK9NdqpO+Cfisd2que1pFkViIwR0anpiptqUc91xcGInVV0tGSjZ6haglJRbxx9fSRW3rmim4BH3tE2esMYQ+w0AaWcwNaggEn97emGZOh4/Ysv7dLjTXTsT9S3HYy64B23Y0CLSQguntF/Qo8sBFwV7nmqLUJuTPMVvUXI1z8AAEN4QS+t+o/c2J2YTwIepEECIiKVbLagHaVAtacGvMiX0B42kaxWz8fkoxWlO1kjUB4A0+mkhNI8C0axDHybOZh5KYM5kIXbfRO6I2Dxm52fa+iweHZDVAPPLlrUULvvRN2MPz6/kgxq5ZIQ6s076+5ByaD27FrxTzOJ+A==; 20:zUEtAfUDZ+ZX8wdppffMiQDz6SNohxA0ZaL6O9V0i06VjwjFhoYdvg9ufoWi9yru89leSGZsy57jh/uZLXXIpeL300zG2w/GNOs948bMsXiusa1cu0TEwzUUAIW5ijKV1YHRGccH1MGT/JhQ/5Qu2Z+xHsyENuA0eDLSdesLoYQ8jle4SIp7b1P8ZNLkhPP+e0Q+VVNCu9nrG96y3Rp/rIRERIcxrCwvUnDj3jOl1+1YxyhP4Y/EF+JWKjMsZyjI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2017 23:08:08.0767 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1237 Subject: [PATCH 3/4] Modify UefiCpuPkg/CpuIo2Dxe to use new BaseIoFifoLib 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: Wed, 04 Jan 2017 23:08:10 -0000 Content-Type: text/plain Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Leo Duran --- UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c | 1 - UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h | 1 + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf | 10 +-- UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm | 140 ---------------------------------- UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm | 136 --------------------------------- UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.asm | 126 ------------------------------ UefiCpuPkg/CpuIo2Dxe/X64/IoFifo.nasm | 125 ------------------------------ 7 files changed, 2 insertions(+), 537 deletions(-) delete mode 100644 UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.asm delete mode 100644 UefiCpuPkg/CpuIo2Dxe/Ia32/IoFifo.nasm 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..dfeb497 100644 --- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c +++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c @@ -13,7 +13,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.h b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h index 7d00da1..9ea24db 100644 --- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h +++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.h @@ -22,6 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #define MAX_IO_PORT_ADDRESS 0xFFFF diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf index 920ede7..b3db712 100644 --- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf +++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf @@ -30,15 +30,6 @@ [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 @@ -48,6 +39,7 @@ BaseLib DebugLib IoLib + IoFifoLib UefiBootServicesTableLib [Protocols] 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/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