From 14ed21f772d5846818391a3f5c153f3546772867 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Wed, 1 Apr 2026 22:41:23 +0200 Subject: [PATCH] XHCI fix naming bug - use XHCI_SLCTX_CTX_ENTRIES instead of XHCI_SLCTX_SLOT_STATE --- kernel/device/usb/xhci.c | 4 ++-- kernel/fs/fat1.c | 22 +++++++++++----------- libfat/_fat.c | 22 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kernel/device/usb/xhci.c b/kernel/device/usb/xhci.c index 5dfa6f3..102880e 100644 --- a/kernel/device/usb/xhci.c +++ b/kernel/device/usb/xhci.c @@ -768,7 +768,7 @@ static void xhci_pdevice_setup_addressing (struct xhci* xhci, struct xhci_pdevic /* Add slot and endpoint 0 */ ctx64->ctrl.dw[1] = (1 << 0) | (1 << 1); - ctx64->slot.dw[0] = (1 << XHCI_SLCTX_SLOT_STATE) | (speed << XHCI_SLCTX_SPEED); + ctx64->slot.dw[0] = (1 << XHCI_SLCTX_CTX_ENTRIES) | (speed << XHCI_SLCTX_SPEED); ctx64->slot.dw[1] = ((pdevice->xhci_port->port_value + 1) << XHCI_SLCTX_ROOTHUBPRNUM); ctx64->endpoints[0].dw[0] = 0; @@ -784,7 +784,7 @@ static void xhci_pdevice_setup_addressing (struct xhci* xhci, struct xhci_pdevic ctx32->ctrl.dw[1] = (1 << 0) | (1 << 1); - ctx32->slot.dw[0] = (1 << XHCI_SLCTX_SLOT_STATE) | (speed << XHCI_SLCTX_SPEED); + ctx32->slot.dw[0] = (1 << XHCI_SLCTX_CTX_ENTRIES) | (speed << XHCI_SLCTX_SPEED); ctx32->slot.dw[1] = ((pdevice->xhci_port->port_value + 1) << XHCI_SLCTX_ROOTHUBPRNUM); ctx32->endpoints[0].dw[1] = (3 << XHCI_EPCTX_ERR_COUNT) | diff --git a/kernel/fs/fat1.c b/kernel/fs/fat1.c index edcf3cd..e6bca50 100644 --- a/kernel/fs/fat1.c +++ b/kernel/fs/fat1.c @@ -290,21 +290,21 @@ typedef _Atomic (uintmax_t) atomic_uintmax_t; #define atomic_compare_exchange_weak(object, expected, desired) \ __c11_atomic_compare_exchange_weak (object, expected, desired, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) #define atomic_compare_exchange_weak_explicit __c11_atomic_compare_exchange_weak -#define atomic_fetch_add(object, operand) __c11_atomic_fetch_add (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_add_explicit __c11_atomic_fetch_add -#define atomic_fetch_sub(object, operand) __c11_atomic_fetch_sub (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_sub_explicit __c11_atomic_fetch_sub -#define atomic_fetch_or(object, operand) __c11_atomic_fetch_or (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_or_explicit __c11_atomic_fetch_or -#define atomic_fetch_xor(object, operand) __c11_atomic_fetch_xor (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_xor_explicit __c11_atomic_fetch_xor -#define atomic_fetch_and(object, operand) __c11_atomic_fetch_and (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_and_explicit __c11_atomic_fetch_and +#define atomic_fetch_add(object, operand) __c11_atomic_fetch_add (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_add_explicit __c11_atomic_fetch_add +#define atomic_fetch_sub(object, operand) __c11_atomic_fetch_sub (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_sub_explicit __c11_atomic_fetch_sub +#define atomic_fetch_or(object, operand) __c11_atomic_fetch_or (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_or_explicit __c11_atomic_fetch_or +#define atomic_fetch_xor(object, operand) __c11_atomic_fetch_xor (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_xor_explicit __c11_atomic_fetch_xor +#define atomic_fetch_and(object, operand) __c11_atomic_fetch_and (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_and_explicit __c11_atomic_fetch_and #define atomic_flag_test_and_set(object) \ __c11_atomic_exchange (&(object)->_Value, 1, __ATOMIC_SEQ_CST) #define atomic_flag_test_and_set_explicit(object, order) \ __c11_atomic_exchange (&(object)->_Value, 1, order) -#define atomic_flag_clear(object) __c11_atomic_store (&(object)->_Value, 0, __ATOMIC_SEQ_CST) +#define atomic_flag_clear(object) __c11_atomic_store (&(object)->_Value, 0, __ATOMIC_SEQ_CST) #define atomic_flag_clear_explicit(object, order) __c11_atomic_store (&(object)->_Value, 0, order) #define __FREESTND_C_HDRS_STDBOOL_H 1 #undef bool diff --git a/libfat/_fat.c b/libfat/_fat.c index d3c36a5..e721d5b 100644 --- a/libfat/_fat.c +++ b/libfat/_fat.c @@ -287,21 +287,21 @@ typedef struct atomic_flag { #define atomic_compare_exchange_weak(object, expected, desired) \ __c11_atomic_compare_exchange_weak (object, expected, desired, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) #define atomic_compare_exchange_weak_explicit __c11_atomic_compare_exchange_weak -#define atomic_fetch_add(object, operand) __c11_atomic_fetch_add (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_add_explicit __c11_atomic_fetch_add -#define atomic_fetch_sub(object, operand) __c11_atomic_fetch_sub (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_sub_explicit __c11_atomic_fetch_sub -#define atomic_fetch_or(object, operand) __c11_atomic_fetch_or (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_or_explicit __c11_atomic_fetch_or -#define atomic_fetch_xor(object, operand) __c11_atomic_fetch_xor (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_xor_explicit __c11_atomic_fetch_xor -#define atomic_fetch_and(object, operand) __c11_atomic_fetch_and (object, operand, __ATOMIC_SEQ_CST) -#define atomic_fetch_and_explicit __c11_atomic_fetch_and +#define atomic_fetch_add(object, operand) __c11_atomic_fetch_add (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_add_explicit __c11_atomic_fetch_add +#define atomic_fetch_sub(object, operand) __c11_atomic_fetch_sub (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_sub_explicit __c11_atomic_fetch_sub +#define atomic_fetch_or(object, operand) __c11_atomic_fetch_or (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_or_explicit __c11_atomic_fetch_or +#define atomic_fetch_xor(object, operand) __c11_atomic_fetch_xor (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_xor_explicit __c11_atomic_fetch_xor +#define atomic_fetch_and(object, operand) __c11_atomic_fetch_and (object, operand, __ATOMIC_SEQ_CST) +#define atomic_fetch_and_explicit __c11_atomic_fetch_and #define atomic_flag_test_and_set(object) \ __c11_atomic_exchange (&(object)->_Value, 1, __ATOMIC_SEQ_CST) #define atomic_flag_test_and_set_explicit(object, order) \ __c11_atomic_exchange (&(object)->_Value, 1, order) -#define atomic_flag_clear(object) __c11_atomic_store (&(object)->_Value, 0, __ATOMIC_SEQ_CST) +#define atomic_flag_clear(object) __c11_atomic_store (&(object)->_Value, 0, __ATOMIC_SEQ_CST) #define atomic_flag_clear_explicit(object, order) __c11_atomic_store (&(object)->_Value, 0, order) #define __FREESTND_C_HDRS_STDBOOL_H 1 #undef bool