From nobody Sat May 10 12:53:29 2025 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) client-ip=80.81.252.135; envelope-from=seabios-bounces@seabios.org; helo=mail.coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from mail.coreboot.org (mail.coreboot.org [80.81.252.135]) by mx.zohomail.com with SMTPS id 1499791877424530.0053854528363; Tue, 11 Jul 2017 09:51:17 -0700 (PDT) Received: from [127.0.0.1] (helo=ra.coresystems.de) by mail.coreboot.org with esmtp (Exim 4.86_2) (envelope-from ) id 1dUyLb-00044v-Bs; Tue, 11 Jul 2017 18:49:15 +0200 Received: from mail-qk0-f195.google.com ([209.85.220.195]) by mail.coreboot.org with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.86_2) (envelope-from ) id 1dUyLN-000413-Jw for seabios@seabios.org; Tue, 11 Jul 2017 18:49:12 +0200 Received: by mail-qk0-f195.google.com with SMTP id v143so1430616qkb.3 for ; Tue, 11 Jul 2017 09:50:43 -0700 (PDT) Received: from localhost ([64.9.249.1]) by smtp.gmail.com with ESMTPSA id b13sm392539qta.25.2017.07.11.09.50.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jul 2017 09:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=koconnor-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZN5f383X40YlA6QLc5kI1DeEo+VapKV4ZoTxnpBsP+4=; b=nkLPj55nd2hwFqvy4dcA45uFZ1/PEZoBsy9dwP+Lb/PmEUMQkMjuHiHhU5djD2kxot isyT/Hsq67xkVvPnEYQwaB3l3kmslg4t3KgnqfioKdEI34diCE6aVzeEplBb/bTpeDG7 AasT/3kJcjqaOBdO1DKiPA61okGNc+6VpeYijtj3V7Kj77JpClRnjVIVEo+5eVqed1ei LHxSQf6LwEcdDt1/ZsFrMlIoV2dckwWItUAwTIgQOEsOqAhFsg7YqmVdxNUptn3Mxi4D /A0WaJFwzpaIPHX7ln2WQSm1z75Mc+yjKPHNWMo6CGcrCoGBh6GgKJxzhmSa+MDJ/WMv 1iQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZN5f383X40YlA6QLc5kI1DeEo+VapKV4ZoTxnpBsP+4=; b=PEWt+NlPT1jHtgd2aK4+Em2hFd6cw4zuJ/u6M4jafo4C3K0OXgMDlyOMJXIXwG+4d8 CYboGmEJ6dN4ko84flyaWTcwM9QVJBLhdu0OiaFm3zFbLWaSwY2pNKZZw5ChAjYC7u7I 5OdO80qqJ5ATQC9u756j8jRxcoUsvnCZd5vEG4iEMucTzx89DHeLXGJdt5xyPto6M0fQ 96x+13Bsnx8zHsIVi1qsMQtiGPbEke2eMbjEsCI+nCYCIgyxMZh511QNXQK8GF+WvwGW dOITRLeteA86qwO32dxR7wHHLDK9XQUO8uhArdumN2XWsp/XJw0vWwoCgqs3BrZFwbPa cQ/g== X-Gm-Message-State: AIVw110LioMrB035bi0GOxXu0zvFyb19q4WSVmuOHDGbeykMCVT8CqEQ quX6dxArvK0ssJQy1HNkrg== X-Received: by 10.55.217.157 with SMTP id q29mr1084380qkl.152.1499791835903; Tue, 11 Jul 2017 09:50:35 -0700 (PDT) From: Kevin O'Connor To: seabios@seabios.org Date: Tue, 11 Jul 2017 12:50:29 -0400 Message-Id: <20170711165032.2443-2-kevin@koconnor.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170711165032.2443-1-kevin@koconnor.net> References: <20170711165032.2443-1-kevin@koconnor.net> X-Spam-Score: -2.1 (--) Subject: [SeaBIOS] [PATCH 1/4] boot: Rename drive_g to drive X-BeenThere: seabios@seabios.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SeaBIOS mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: seabios-bounces@seabios.org Sender: "SeaBIOS" X-Duff: Orig. Duff, Duff Lite, Duff Dry, Duff Dark, Raspberry Duff, Lady Duff, Red Duff, Tartar Control Duff X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The 'struct drive_s' pointer is a 32bit pointer (and boot.c code is only compiled in 32bit mode), so avoid using the "_g" suffix on the pointer. Signed-off-by: Kevin O'Connor --- src/boot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/boot.c b/src/boot.c index 59623fb..83d48f2 100644 --- a/src/boot.c +++ b/src/boot.c @@ -372,24 +372,24 @@ boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio) } =20 void -boot_add_floppy(struct drive_s *drive_g, const char *desc, int prio) +boot_add_floppy(struct drive_s *drive, const char *desc, int prio) { bootentry_add(IPL_TYPE_FLOPPY, defPrio(prio, DefaultFloppyPrio) - , (u32)drive_g, desc); + , (u32)drive, desc); } =20 void -boot_add_hd(struct drive_s *drive_g, const char *desc, int prio) +boot_add_hd(struct drive_s *drive, const char *desc, int prio) { bootentry_add(IPL_TYPE_HARDDISK, defPrio(prio, DefaultHDPrio) - , (u32)drive_g, desc); + , (u32)drive, desc); } =20 void -boot_add_cd(struct drive_s *drive_g, const char *desc, int prio) +boot_add_cd(struct drive_s *drive, const char *desc, int prio) { bootentry_add(IPL_TYPE_CDROM, defPrio(prio, DefaultCDPrio) - , (u32)drive_g, desc); + , (u32)drive, desc); } =20 // Add a CBFS payload entry @@ -648,13 +648,13 @@ boot_disk(u8 bootdrv, int checksig) =20 // Boot from a CD-ROM static void -boot_cdrom(struct drive_s *drive_g) +boot_cdrom(struct drive_s *drive) { if (! CONFIG_CDROM_BOOT) return; printf("Booting from DVD/CD...\n"); =20 - int status =3D cdrom_boot(drive_g); + int status =3D cdrom_boot(drive); if (status) { printf("Boot failed: Could not read from CDROM (code %04x)\n", sta= tus); return; --=20 2.9.4 _______________________________________________ SeaBIOS mailing list SeaBIOS@seabios.org https://mail.coreboot.org/mailman/listinfo/seabios