You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.4 KiB
43 lines
1.4 KiB
7 months ago
|
From a8a487d886f701b1a1e8991074d84ddacf41fcd0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Janssen <medhefgo@web.de>
|
||
|
|
Date: Wed, 25 Jan 2023 15:23:49 +0100
|
||
|
|
Subject: [PATCH] boot: Use unsigned for beep counting
|
||
|
|
|
||
|
|
(cherry picked from commit 54d9ecc380360e925ef5ca7886c8546424ddf4fe)
|
||
|
|
|
||
|
|
Related: RHEL-16952
|
||
|
|
---
|
||
|
|
src/boot/efi/util.c | 2 +-
|
||
|
|
src/boot/efi/util.h | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c
|
||
|
|
index 2be18936b0..7596bc3edc 100644
|
||
|
|
--- a/src/boot/efi/util.c
|
||
|
|
+++ b/src/boot/efi/util.c
|
||
|
|
@@ -587,7 +587,7 @@ static inline void outb(uint16_t port, uint8_t value) {
|
||
|
|
asm volatile("outb %0, %1" : : "a"(value), "Nd"(port));
|
||
|
|
}
|
||
|
|
|
||
|
|
-void beep(UINTN beep_count) {
|
||
|
|
+void beep(unsigned beep_count) {
|
||
|
|
enum {
|
||
|
|
PITCH = 500,
|
||
|
|
BEEP_DURATION_USEC = 100 * 1000,
|
||
|
|
diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
|
||
|
|
index 33472a5b6a..b97dc9768c 100644
|
||
|
|
--- a/src/boot/efi/util.h
|
||
|
|
+++ b/src/boot/efi/util.h
|
||
|
|
@@ -201,9 +201,9 @@ void hexdump(const char16_t *prefix, const void *data, UINTN size);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if defined(__i386__) || defined(__x86_64__)
|
||
|
|
-void beep(UINTN beep_count);
|
||
|
|
+void beep(unsigned beep_count);
|
||
|
|
#else
|
||
|
|
-static inline void beep(UINTN beep_count) {}
|
||
|
|
+static inline void beep(unsigned beep_count) {}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
EFI_STATUS open_volume(EFI_HANDLE device, EFI_FILE **ret_file);
|