diff options
Diffstat (limited to 'usr/src/uts/sun/sys')
| -rw-r--r-- | usr/src/uts/sun/sys/bootconf.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/sun/sys/dada/impl/identify.h | 22 | ||||
| -rw-r--r-- | usr/src/uts/sun/sys/obpdefs.h | 8 | ||||
| -rw-r--r-- | usr/src/uts/sun/sys/promif.h | 50 |
4 files changed, 49 insertions, 35 deletions
diff --git a/usr/src/uts/sun/sys/bootconf.h b/usr/src/uts/sun/sys/bootconf.h index d7143836a9..40e7d25fac 100644 --- a/usr/src/uts/sun/sys/bootconf.h +++ b/usr/src/uts/sun/sys/bootconf.h @@ -171,7 +171,7 @@ typedef unsigned long long boot_cell_t; #define boot_offt2cell(u) ((boot_cell_t)((off_t)(u))) #define boot_size2cell(u) ((boot_cell_t)((size_t)(u))) #define boot_phandle2cell(ph) ((boot_cell_t)((unsigned)((phandle_t)(ph)))) -#define boot_dnode2cell(d) ((boot_cell_t)((unsigned)((dnode_t)(d)))) +#define boot_dnode2cell(d) ((boot_cell_t)((unsigned)((pnode_t)(d)))) #define boot_ihandle2cell(ih) ((boot_cell_t)((unsigned)((ihandle_t)(ih)))) #define boot_cell2ptr(p) ((void *)(uintptr_t)((boot_cell_t)(p))) @@ -181,7 +181,7 @@ typedef unsigned long long boot_cell_t; #define boot_cell2offt(u) ((off_t)((boot_cell_t)(u))) #define boot_cell2size(u) ((size_t)((boot_cell_t)(u))) #define boot_cell2phandle(ph) ((phandle_t)((boot_cell_t)(ph))) -#define boot_cell2dnode(d) ((dnode_t)((boot_cell_t)(d))) +#define boot_cell2dnode(d) ((pnode_t)((boot_cell_t)(d))) #define boot_cell2ihandle(ih) ((ihandle_t)((boot_cell_t)(ih))) #define boot_cells2ull(h, l) ((unsigned long long)(boot_cell_t)(l)) diff --git a/usr/src/uts/sun/sys/dada/impl/identify.h b/usr/src/uts/sun/sys/dada/impl/identify.h index d394d8833c..fe52d7ea21 100644 --- a/usr/src/uts/sun/sys/dada/impl/identify.h +++ b/usr/src/uts/sun/sys/dada/impl/identify.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -71,11 +71,15 @@ struct dcd_identify { ushort_t dcd_recmwdma; /* 66 rec multi-word dma cycle info */ ushort_t dcd_minpio; /* 67 min PIO cycle info */ ushort_t dcd_minpioflow; /* 68 min PIO cycle info w/flow ctl */ - ushort_t dcd_padding1[19]; /* 69 pad to 87 */ + ushort_t dcd_padding1[11]; /* 69 pad to 79 */ + ushort_t dcd_majvers; /* 80 ATA major version supported */ + ushort_t dcd_padding2[4]; /* 81 pad to 84 */ + ushort_t dcd_features85; /* 85 feature enabled bits */ + ushort_t dcd_padding3[2]; /* 86 pad to 87 */ ushort_t dcd_ultra_dma; /* 88 Ultra dma capability */ - ushort_t dcd_padding2[37]; /* 89 pad to 125 */ + ushort_t dcd_padding4[37]; /* 89 pad to 125 */ ushort_t dcd_lastlun; /* 126 last logical unit number */ - ushort_t dcd_padding3[129]; /* pad to 255 */ + ushort_t dcd_padding5[129]; /* pad to 255 */ }; @@ -97,6 +101,16 @@ struct dcd_identify { #define PIO_MODE4_MASK 0x02 #define PIO_MODE3_MASK 0x01 +/* + * The following are bits for dcd_majvers, word 80 + */ +#define IDENTIFY_80_ATAPI_4 0x0010 + +/* + * The following are the bits for dcd_features85, word 85 + */ +#define IDENTIFY_85_WCE (1 << 5) + #ifdef __cplusplus } #endif diff --git a/usr/src/uts/sun/sys/obpdefs.h b/usr/src/uts/sun/sys/obpdefs.h index 2689ba7d6d..8a975c8656 100644 --- a/usr/src/uts/sun/sys/obpdefs.h +++ b/usr/src/uts/sun/sys/obpdefs.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1991-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,14 +37,14 @@ extern "C" { typedef int ihandle_t; typedef int phandle_t; -typedef phandle_t dnode_t; +typedef phandle_t pnode_t; /* * Device type matching */ -#define OBP_NONODE ((dnode_t)0) -#define OBP_BADNODE ((dnode_t)-1) +#define OBP_NONODE ((pnode_t)0) +#define OBP_BADNODE ((pnode_t)-1) /* * Property Defines diff --git a/usr/src/uts/sun/sys/promif.h b/usr/src/uts/sun/sys/promif.h index eecd400f71..b07835fa08 100644 --- a/usr/src/uts/sun/sys/promif.h +++ b/usr/src/uts/sun/sys/promif.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -86,13 +86,13 @@ extern void prom_free(caddr_t virt, size_t size); /* * Device tree and property group: OBP and IEEE 1275-1994. */ -extern dnode_t prom_childnode(dnode_t nodeid); -extern dnode_t prom_nextnode(dnode_t nodeid); -extern dnode_t prom_parentnode(dnode_t nodeid); -extern dnode_t prom_rootnode(void); -extern dnode_t prom_chosennode(void); -extern dnode_t prom_alias_node(void); -extern dnode_t prom_optionsnode(void); +extern pnode_t prom_childnode(pnode_t nodeid); +extern pnode_t prom_nextnode(pnode_t nodeid); +extern pnode_t prom_parentnode(pnode_t nodeid); +extern pnode_t prom_rootnode(void); +extern pnode_t prom_chosennode(void); +extern pnode_t prom_alias_node(void); +extern pnode_t prom_optionsnode(void); extern int prom_asr_list_keys_len(); extern int prom_asr_list_keys(caddr_t value); @@ -102,16 +102,16 @@ extern int prom_asr_disable(char *keystr, int keystr_len, char *reason, int reason_len); extern int prom_asr_enable(char *keystr, int keystr_len); -extern int prom_getproplen(dnode_t nodeid, caddr_t name); -extern int prom_getprop(dnode_t nodeid, caddr_t name, +extern int prom_getproplen(pnode_t nodeid, caddr_t name); +extern int prom_getprop(pnode_t nodeid, caddr_t name, caddr_t value); -extern caddr_t prom_nextprop(dnode_t nodeid, caddr_t previous, +extern caddr_t prom_nextprop(pnode_t nodeid, caddr_t previous, caddr_t next); -extern int prom_setprop(dnode_t nodeid, caddr_t name, +extern int prom_setprop(pnode_t nodeid, caddr_t name, caddr_t value, int len); -extern int prom_getnode_byname(dnode_t id, char *name); -extern int prom_devicetype(dnode_t id, char *type); +extern int prom_getnode_byname(pnode_t id, char *name); +extern int prom_devicetype(pnode_t id, char *type); extern char *prom_decode_composite_string(void *buf, size_t buflen, char *prev); @@ -119,9 +119,9 @@ extern char *prom_decode_composite_string(void *buf, /* * Device tree and property group: IEEE 1275-1994 Only. */ -extern dnode_t prom_finddevice(char *path); /* Also on obp2.x */ +extern pnode_t prom_finddevice(char *path); /* Also on obp2.x */ -extern int prom_bounded_getprop(dnode_t nodeid, +extern int prom_bounded_getprop(pnode_t nodeid, caddr_t name, caddr_t buffer, int buflen); extern phandle_t prom_getphandle(ihandle_t i); @@ -148,8 +148,8 @@ extern int prom_phandle_to_path(phandle_t, char *buf, */ extern ihandle_t prom_stdin_ihandle(void); extern ihandle_t prom_stdout_ihandle(void); -extern dnode_t prom_stdin_node(void); -extern dnode_t prom_stdout_node(void); +extern pnode_t prom_stdin_node(void); +extern pnode_t prom_stdout_node(void); extern char *prom_stdinpath(void); extern char *prom_stdoutpath(void); extern int prom_stdin_devname(char *buffer); @@ -179,7 +179,7 @@ extern int prom_getversion(void); extern int prom_is_openprom(void); extern int prom_is_p1275(void); extern int prom_version_name(char *buf, int buflen); -extern int prom_version_check(char *buf, size_t len, dnode_t *n); +extern int prom_version_check(char *buf, size_t len, pnode_t *n); extern void *prom_mon_id(void); /* SMCC/OBP platform centric */ @@ -223,7 +223,7 @@ extern void prom_set_symbol_lookup(void *sym2val, void *val2sym); * Administrative group: IEEE 1275 only. */ extern int prom_test(char *service); -extern int prom_test_method(char *method, dnode_t node); +extern int prom_test_method(char *method, pnode_t node); /* * Promif support group: Generic. @@ -264,7 +264,7 @@ extern ssize_t prom_write(ihandle_t fd, caddr_t buf, size_t len, extern int prom_seek(int fd, u_longlong_t offset); extern void prom_writestr(const char *buf, size_t bufsize); -extern void prom_dnode_to_pathname(dnode_t, char *); +extern void prom_pnode_to_pathname(pnode_t, char *); /*PRINTFLIKE1*/ extern void prom_printf(const char *fmt, ...) @@ -284,12 +284,12 @@ extern char *prom_vsprintf(char *s, const char *fmt, __va_list adx) #define PROM_WALK_CONTINUE 0 /* keep walking to next node */ #define PROM_WALK_TERMINATE 1 /* abort walk now */ -extern void prom_walk_devs(dnode_t node, - int (*f)(dnode_t, void *, void *), +extern void prom_walk_devs(pnode_t node, + int (*f)(pnode_t, void *, void *), void *arg, void *result); -extern dnode_t prom_findnode_byname(dnode_t id, char *name); -extern dnode_t prom_findnode_bydevtype(dnode_t id, char *devtype); +extern pnode_t prom_findnode_byname(pnode_t id, char *name); +extern pnode_t prom_findnode_bydevtype(pnode_t id, char *devtype); #define PROM_STOP { \ prom_printf("File %s line %d\n", __FILE__, __LINE__); \ |