Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Dec 2025 02:35:46 +0000
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: d2850435f18c - main - aq(4): Use sys, not userland, headers
Message-ID:  <693a2e02.318dc.3facb64@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=d2850435f18c81479f79bd23ea8d4b997dbc0521

commit d2850435f18c81479f79bd23ea8d4b997dbc0521
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-11-13 19:05:08 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-12-11 02:35:06 +0000

    aq(4): Use sys, not userland, headers
    
    And remove some unused definitions.
    
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D54152
---
 sys/dev/aq/aq_common.h | 8 +-------
 sys/dev/aq/aq_dbg.h    | 2 +-
 sys/dev/aq/aq_fw.c     | 2 +-
 sys/dev/aq/aq_fw1x.c   | 2 +-
 sys/dev/aq/aq_fw2x.c   | 2 +-
 sys/dev/aq/aq_hw.h     | 1 -
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sys/dev/aq/aq_common.h b/sys/dev/aq/aq_common.h
index b123a7e6807d..17dcc5f23fb1 100644
--- a/sys/dev/aq/aq_common.h
+++ b/sys/dev/aq/aq_common.h
@@ -35,14 +35,10 @@
 #ifndef _AQ_COMMON_H_
 #define _AQ_COMMON_H_
 
-#include <stdint.h>
+#include <sys/types.h>
 
 #define ETH_MAC_LEN 6
 
-/* Types definition */
-#define TRUE     1
-#define FALSE    0
-
 #define s8       __int8_t
 #define u8       __uint8_t
 #define u16      __uint16_t
@@ -51,7 +47,6 @@
 #define u64      __uint64_t
 #define s64      __int64_t
 #define s32      int
-typedef __uint32_t DWORD;
 
 #define ETIME ETIMEDOUT
 #define EOK 0
@@ -77,7 +72,6 @@ typedef __uint32_t DWORD;
     } while (0)
 
 
-#define LODWORD(a) ((DWORD)(a))
 #define LOWORD(a) ((u16)(a))
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
diff --git a/sys/dev/aq/aq_dbg.h b/sys/dev/aq/aq_dbg.h
index bb786bf0adc6..8d02f483b2f7 100644
--- a/sys/dev/aq/aq_dbg.h
+++ b/sys/dev/aq/aq_dbg.h
@@ -38,7 +38,7 @@
 #ifndef AQ_DBG_H
 #define AQ_DBG_H
 
-#include <syslog.h>
+#include <sys/syslog.h>
 #include <sys/systm.h>
 /*
 Debug levels:
diff --git a/sys/dev/aq/aq_fw.c b/sys/dev/aq/aq_fw.c
index 619a3048cc28..3596074dbafc 100644
--- a/sys/dev/aq/aq_fw.c
+++ b/sys/dev/aq/aq_fw.c
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <errno.h>
+#include <sys/errno.h>
 
 #include "aq_common.h"
 
diff --git a/sys/dev/aq/aq_fw1x.c b/sys/dev/aq/aq_fw1x.c
index 97bbbfc5e335..02b3f649201c 100644
--- a/sys/dev/aq/aq_fw1x.c
+++ b/sys/dev/aq/aq_fw1x.c
@@ -35,7 +35,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <errno.h>
+#include <sys/errno.h>
 
 #include "aq_common.h"
 #include "aq_hw.h"
diff --git a/sys/dev/aq/aq_fw2x.c b/sys/dev/aq/aq_fw2x.c
index c76a0342c3f2..b532977b748f 100644
--- a/sys/dev/aq/aq_fw2x.c
+++ b/sys/dev/aq/aq_fw2x.c
@@ -38,7 +38,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <errno.h>
+#include <sys/errno.h>
 
 #include "aq_common.h"
 
diff --git a/sys/dev/aq/aq_hw.h b/sys/dev/aq/aq_hw.h
index bf7f2896c7ca..97744de118b8 100644
--- a/sys/dev/aq/aq_hw.h
+++ b/sys/dev/aq/aq_hw.h
@@ -35,7 +35,6 @@
 #ifndef _AQ_HW_H_
 #define _AQ_HW_H_
 
-#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <machine/cpufunc.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693a2e02.318dc.3facb64>