summaryrefslogtreecommitdiff
path: root/usr/src/uts/common
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common')
-rw-r--r--usr/src/uts/common/io/ib/clients/rds/rdsib.c4
-rw-r--r--usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c1
-rw-r--r--usr/src/uts/common/io/idm/idm.c2
-rw-r--r--usr/src/uts/common/io/nge/nge_chip.h38
-rw-r--r--usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h6
-rw-r--r--usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h2
-rw-r--r--usr/src/uts/common/sys/idm/idm_impl.h2
-rw-r--r--usr/src/uts/common/sys/mhd.h12
-rw-r--r--usr/src/uts/common/sys/rgb.h35
9 files changed, 66 insertions, 36 deletions
diff --git a/usr/src/uts/common/io/ib/clients/rds/rdsib.c b/usr/src/uts/common/io/ib/clients/rds/rdsib.c
index ebfa352ac0..b80b385d75 100644
--- a/usr/src/uts/common/io/ib/clients/rds/rdsib.c
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsib.c
@@ -71,6 +71,10 @@ rds_transport_ops_t rds_ib_transport_ops = {
rds_if_lookup_by_name
};
+/* Global pools of buffers */
+rds_bufpool_t rds_dpool; /* data pool */
+rds_bufpool_t rds_cpool; /* ctrl pool */
+
/* global */
rds_state_t *rdsib_statep = NULL;
krwlock_t rds_loopback_portmap_lock;
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
index 5cc3160b3a..028ceb9937 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c
@@ -66,6 +66,7 @@
#include <sys/mac_provider.h>
#include <sys/mac_client_priv.h>
+uint_t rdsv3_one_sec_in_hz;
ddi_taskq_t *rdsv3_taskq = NULL;
extern kmem_cache_t *rdsv3_alloc_cache;
diff --git a/usr/src/uts/common/io/idm/idm.c b/usr/src/uts/common/io/idm/idm.c
index 1361b8dfb9..ade553dabd 100644
--- a/usr/src/uts/common/io/idm/idm.c
+++ b/usr/src/uts/common/io/idm/idm.c
@@ -107,6 +107,8 @@ idm_transport_t idm_transport_list[] = {
};
+idm_global_t idm; /* Global state */
+
int
_init(void)
{
diff --git a/usr/src/uts/common/io/nge/nge_chip.h b/usr/src/uts/common/io/nge/nge_chip.h
index 089f77320a..1d1e85be08 100644
--- a/usr/src/uts/common/io/nge/nge_chip.h
+++ b/usr/src/uts/common/io/nge/nge_chip.h
@@ -522,7 +522,7 @@ typedef union _nge_rx_cntrl0 {
uint32_t crcm:1;
uint32_t ofolm:1;
uint32_t framerm:1;
- uint32_t resv23_31:9;
+ uint32_t resv23_31:9;
} cntl_bits;
} nge_rx_cntrl0;
@@ -627,7 +627,7 @@ typedef union _nge_rx_def {
* Low 32 bit unicast address
*/
#define NGE_UNI_ADDR0 0x0a8
-union {
+typedef union _nge_uni_addr0 {
uint32_t addr_val;
struct {
uint32_t addr;
@@ -655,12 +655,12 @@ typedef union _nge_uni_addr1 {
* Low 32 bit multicast address
*/
#define NGE_MUL_ADDR0 0x0b0
-union {
+typedef union _nge_mul_addr0 {
uint32_t addr_val;
struct {
uint32_t addr;
}addr_bits;
-}nge_mul_addr0;
+} nge_mul_addr0;
/*
* High 32 bit multicast address
@@ -672,13 +672,13 @@ typedef union _nge_mul_addr1 {
uint32_t addr:16;
uint32_t resv16_31:16;
}addr_bits;
-}nge_mul_addr1;
+} nge_mul_addr1;
/*
* Low 32 bit multicast mask
*/
#define NGE_MUL_MASK 0x0b8
-union {
+typedef union _nge_mul_mask0 {
uint32_t mask_val;
struct {
uint32_t mask;
@@ -689,7 +689,7 @@ union {
* High 32 bit multicast mask
*/
#define NGE_MUL_MASK1 0x0bc
-union {
+typedef union _nge_mul_mask1 {
uint32_t mask_val;
struct {
uint32_t mask:16;
@@ -800,7 +800,7 @@ typedef union _nge_rx_poll {
* Transmit polling count
*/
#define NGE_TX_PCNT 0x114
-union {
+typedef union _nge_tx_pcnt {
uint32_t cnt_val;
struct {
uint32_t pcnt:32;
@@ -811,7 +811,7 @@ union {
* Receive polling count
*/
#define NGE_RX_PCNT 0x118
-union {
+typedef union _nge_rx_pcnt {
uint32_t cnt_val;
struct {
uint32_t pcnt:32;
@@ -823,7 +823,7 @@ union {
* Current tx's descriptor address
*/
#define NGE_TX_CUR_DADR 0x11c
-union {
+typedef union _nge_tx_cur_addr {
uint32_t addr_val;
struct {
uint32_t resv0_2:3;
@@ -835,7 +835,7 @@ union {
* Current rx's descriptor address
*/
#define NGE_RX_CUR_DADR 0x120
-union {
+typedef union _nge_rx_cur_addr {
uint32_t addr_val;
struct {
uint32_t resv0_2:3;
@@ -847,7 +847,7 @@ union {
* Current tx's data buffer address
*/
#define NGE_TX_CUR_PRD0 0x124
-union {
+typedef union _nge_tx_cur_prd0 {
uint32_t prd0_val;
struct {
uint32_t prd0:32;
@@ -858,7 +858,7 @@ union {
* Current tx's data buffer status
*/
#define NGE_TX_CUR_PRD1 0x128
-union {
+typedef union _nge_tx_cur_prd1 {
uint32_t prd1_val;
struct {
uint32_t rebytes:16;
@@ -870,12 +870,12 @@ union {
* Current rx's data buffer address
*/
#define NGE_RX_CUR_PRD0 0x12c
-union {
+typedef union _nge_rx_cur_prd0 {
uint32_t prd0_val;
struct {
uint32_t prd0:32;
}prd0_bits;
-}nge_rx_cur_prd0;
+} nge_rx_cur_prd0;
/*
* Current rx's data buffer status
@@ -886,18 +886,18 @@ union {
* Next tx's descriptor address
*/
#define NGE_TX_NXT_DADR 0x134
-union {
+typedef union _nge_tx_nxt_dadr {
uint32_t dadr_val;
struct {
uint32_t addr:32;
}addr_bits;
-}nge_tx_nxt_dadr;
+} nge_tx_nxt_dadr;
/*
* Next rx's descriptor address
*/
#define NGE_RX_NXT_DADR 0x138
-union {
+typedef union _nge_rx_nxt_dadr {
uint32_t dadr_val;
struct {
uint32_t addr:32;
@@ -1362,7 +1362,7 @@ typedef union {
#define MII_CICADA_DISABLE_ECHO_MODE 0x2000
#define MII_CICADA_EXT_CONTROL MII_VENDOR(7)
-#define MII_CICADA_MODE_SELECT_BITS 0xf000
+#define MII_CICADA_MODE_SELECT_BITS 0xf000
#define MII_CICADA_MODE_SELECT_RGMII 0x1000
#define MII_CICADA_POWER_SUPPLY_BITS 0x0e00
#define MII_CICADA_POWER_SUPPLY_3_3V 0x0000
diff --git a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
index 5e2f419600..164af2aa7a 100644
--- a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
+++ b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
@@ -75,8 +75,6 @@
#ifndef _RDSIB_BUF_H
#define _RDSIB_BUF_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -149,8 +147,8 @@ typedef struct rds_bufpool_s {
} rds_bufpool_t;
/* Global pools of buffers */
-rds_bufpool_t rds_dpool; /* data pool */
-rds_bufpool_t rds_cpool; /* ctrl pool */
+extern rds_bufpool_t rds_dpool; /* data pool */
+extern rds_bufpool_t rds_cpool; /* ctrl pool */
/* defined in rds_buf.c */
int rds_init_recv_caches(rds_state_t *statep);
diff --git a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
index 56b92f8037..c462306418 100644
--- a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
+++ b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
@@ -117,7 +117,7 @@ typedef unsigned int atomic_t;
#define clear_le_bit(b, p) clear_bit(b ^ LE_BIT_XOR, p)
#define test_le_bit(b, p) test_bit(b ^ LE_BIT_XOR, p)
-uint_t rdsv3_one_sec_in_hz;
+extern uint_t rdsv3_one_sec_in_hz;
#define jiffies 100
#define HZ (drv_hztousec(1))
diff --git a/usr/src/uts/common/sys/idm/idm_impl.h b/usr/src/uts/common/sys/idm/idm_impl.h
index 346611719d..1e816ee211 100644
--- a/usr/src/uts/common/sys/idm/idm_impl.h
+++ b/usr/src/uts/common/sys/idm/idm_impl.h
@@ -472,7 +472,7 @@ typedef struct {
kmem_cache_t *idm_so_128k_buf_cache;
} idm_global_t;
-idm_global_t idm; /* Global state */
+extern idm_global_t idm; /* Global state */
int
idm_idpool_create(idm_idpool_t *pool);
diff --git a/usr/src/uts/common/sys/mhd.h b/usr/src/uts/common/sys/mhd.h
index 66d57266ad..3d7e0d5d5a 100644
--- a/usr/src/uts/common/sys/mhd.h
+++ b/usr/src/uts/common/sys/mhd.h
@@ -27,8 +27,6 @@
#ifndef _SYS_MHD_H
#define _SYS_MHD_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -41,8 +39,8 @@ extern "C" {
#define MHIOCTKOWN (MHIOC|2)
#define MHIOCRELEASE (MHIOC|3)
#define MHIOCSTATUS (MHIOC|4)
-#define MHIOCGRP_INKEYS (MHIOC|5)
-#define MHIOCGRP_INRESV (MHIOC|6)
+#define MHIOCGRP_INKEYS (MHIOC|5)
+#define MHIOCGRP_INRESV (MHIOC|6)
#define MHIOCGRP_REGISTER (MHIOC|7)
#define MHIOCGRP_RESERVE (MHIOC|8)
#define MHIOCGRP_PREEMPTANDABORT (MHIOC|9)
@@ -79,13 +77,13 @@ typedef struct mhioc_inkeys {
} mhioc_inkeys_t;
#if defined(_SYSCALL32)
-struct mhioc_key_list32 {
+typedef struct mhioc_key_list32 {
uint32_t listsize;
uint32_t listlen;
caddr32_t list;
} mhioc_key_list32_t;
-struct mhioc_inkeys32 {
+typedef struct mhioc_inkeys32 {
uint32_t generation;
caddr32_t li;
} mhioc_inkeys32_t;
@@ -110,7 +108,7 @@ typedef struct mhioc_inresvs {
} mhioc_inresvs_t;
#if defined(_SYSCALL32)
-struct mhioc_resv_desc_list32 {
+typedef struct mhioc_resv_desc_list32 {
uint32_t listsize;
uint32_t listlen;
caddr32_t list;
diff --git a/usr/src/uts/common/sys/rgb.h b/usr/src/uts/common/sys/rgb.h
index 9ddfaa9e3f..6e0ba29af2 100644
--- a/usr/src/uts/common/sys/rgb.h
+++ b/usr/src/uts/common/sys/rgb.h
@@ -23,6 +23,13 @@ extern "C" {
#endif
/*
+ * Number of "base" colors is 16, 8 dark and 8 bright/light.
+ * Color map size for indexed colors is 256, to support VGA 256-color modes.
+ */
+#define NCOLORS 16
+#define NCMAP 256
+
+/*
* Color data from bootloader.
*/
typedef struct rgb_color {
@@ -37,9 +44,9 @@ typedef struct rgb {
} rgb_t;
typedef struct {
- uint8_t red[16];
- uint8_t green[16];
- uint8_t blue[16];
+ uint8_t red[NCOLORS];
+ uint8_t green[NCOLORS];
+ uint8_t blue[NCOLORS];
} text_cmap_t;
extern const text_cmap_t cmap4_to_24;
@@ -67,10 +74,30 @@ typedef enum pc_colors {
pc_brt_white = 15
} pc_colors_t;
+typedef enum sun_colors {
+ sun_brt_white = 0,
+ sun_black = 1,
+ sun_blue = 2,
+ sun_green = 3,
+ sun_cyan = 4,
+ sun_red = 5,
+ sun_magenta = 6,
+ sun_brown = 7,
+ sun_white = 8,
+ sun_grey = 9,
+ sun_brt_blue = 10,
+ sun_brt_green = 11,
+ sun_brt_cyan = 12,
+ sun_brt_red = 13,
+ sun_brt_magenta = 14,
+ sun_yellow = 15,
+} sun_colors_t;
+
#define XLATE_NCOLORS 8
extern const uint8_t dim_xlate[XLATE_NCOLORS];
extern const uint8_t brt_xlate[XLATE_NCOLORS];
-extern const uint8_t solaris_color_to_pc_color[16];
+extern const uint8_t solaris_color_to_pc_color[NCOLORS];
+extern const uint8_t pc_color_to_solaris_color[NCOLORS];
extern uint32_t rgb_color_map(const rgb_t *, uint8_t);
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-01 08:25:39 +0000