*** ../../man-orig/sata_device.txt Mon Nov 7 18:43:33 2005 --- sata_device.man.changed Mon Nov 7 18:22:00 2005 *************** *** 5,11 **** sata_device - structure specifying SATA device SYNOPSIS ! #include INTERFACE LEVEL Consolidation Private --- 5,11 ---- sata_device - structure specifying SATA device SYNOPSIS ! #include INTERFACE LEVEL Consolidation Private *************** *** 16,29 **** STRUCTURE MEMBERS ! int sata_device_rev; /* structure version */ ! sata_address_t addr; /* sata port/device address */ ! uint16_t state; /* Port or dev config state */ ! uint16_t dev_type; /* Attached device type */ uint32_t port_sstatus; /* Port SStatus */ uint32_t port_serror; /* Port SError */ --- 16,31 ---- STRUCTURE MEMBERS ! int satadev_rev; /* structure version */ ! sata_address_t satadev_addr; /* sata port/device address */ ! uint32_t satadev_state; /* Port or dev config state */ ! uint32_t satadev_type; /* Attached device type */ + struct sata_port_scr + uint32_t port_sstatus; /* Port SStatus */ uint32_t port_serror; /* Port SError */ *************** *** 34,64 **** uint32_t port_snotific; /* Port SNotification */ ! uint32_t num_info; /* function-specific ! informative value */ ! sata_device_rev Version of the sata_device structure. ! addr SATA port or SATA device address - see sata_address structure description ! state SATA port or SATA device configuration states. Configuration state field is set by SATA HBA Framework. ! Common device/port states: SATA_STATE_UNKNOWN Device/port not initialized, state unknown SATA_STATE_PROBING Device/port in state of being ! probbed SATA_STATE_PROBED Device/port probing completed SATA_STATE_READY Device/port is ready ! Device-specific configuration states: SATA_DSTATE_PWR_ACTIVE Device is in power state ACTIVE --- 36,77 ---- uint32_t port_snotific; /* Port SNotification */ ! uint32_t satadev_add_info; /* function-specific additional ! information value returned ! by SATA HBA driver ! */ ! satadev_rev Version of the sata_device structure. ! satadev_addr SATA port or SATA device address - see sata_address structure description ! satadev_state SATA port or SATA device configuration states. Configuration state field is set by SATA HBA Framework. ! Common flags specifying current state of a port or ! an attached drive. These states are mutually exclusive, except ! except SATA_STATE_PROBED and SATA_STATE_READY that may be set ! at the same time. SATA_STATE_UNKNOWN Device/port not initialized, state unknown SATA_STATE_PROBING Device/port in state of being ! probed SATA_STATE_PROBED Device/port probing completed SATA_STATE_READY Device/port is ready ! Attached drive specific states. ! SATA_DSTATE_PWR_ACTIVE, SATA_DSTATE_PWR_IDLE and ! SATA_DSTATE_PWR_STANDBY are mutually exclusive. All other ! states may be combined with each other and with one of ! the power states. These flags may be used only if the address ! qualifier (satadev_addr.qual) is set to SATA_ADDR_DCPORT or ! SATA_ADDR_DPMPORT value. SATA_DSTATE_PWR_ACTIVE Device is in power state ACTIVE *************** *** 83,95 **** SATA_DSTATE_FAILED Device has failed - it is in unusable state ! The SATA_DSTATE_PWR_ACTIVE, SATA_DSTATE_PWR_IDLE and ! SATA_DSTATE_PWR_STANDBY are mutually exclusive. All ! other states may be combined with each other and with ! one of the above power states. - Port-specific configuration states: - SATA_PSTATE_PWRON Port and/or serial link interface is powered-up --- 96,108 ---- SATA_DSTATE_FAILED Device has failed - it is in unusable state ! SATA Port specific states ! SATA_PSTATE_PWRON and SATA_PSTATE_PWROFF are mutually exclusive. ! All other states may be combined with each other and with one ! of the power level state. These flags may be used only if ! the address qualifier (satadev_addr.qual) is set to ! SATA_ADDR_CPORT or SATA_ADDR_PMPORT value. SATA_PSTATE_PWRON Port and/or serial link interface is powered-up *************** *** 110,116 **** used, depending on the type of the device they describe, but they cannot be intermixed. ! dev_type Attached device type. SATA HBA driver may set only SATA_DTYPE_NONE, SATA_DTYPE_PMULT or SATA_DTYPE_UNKNOWN device type. Other types are set by SATA HBA framework. --- 123,129 ---- used, depending on the type of the device they describe, but they cannot be intermixed. ! satadev_type Attached device type. SATA HBA driver may set only SATA_DTYPE_NONE, SATA_DTYPE_PMULT or SATA_DTYPE_UNKNOWN device type. Other types are set by SATA HBA framework. *************** *** 123,129 **** SATA_DTYPE_ATAPICD ATAPI CD/DVD SATA device is attached to the specified port ! SATA_DTYPE_ATAPI ATAPI non-CD/DVD SATA device is attached to the specified port SATA_DTYPE_PMULT Port Multiplier is attached to --- 136,142 ---- SATA_DTYPE_ATAPICD ATAPI CD/DVD SATA device is attached to the specified port ! SATA_DTYPE_ATAPINONCD ATAPI non-CD/DVD SATA device is attached to the specified port SATA_DTYPE_PMULT Port Multiplier is attached to *************** *** 135,148 **** determined. ! port_sstatus, port_serror, port_scontrol, port_sactive, port_snotific ! These fields should be set by SATA HBA driver to the same value as their equivalent registers in the port SCR register block (see Serial ATA II specification). ! num_info Function-specific informational value, for example: ! For sata_tran_probe_port() this field may contain a number of device ports on the Port Multiplier, if an attached device dev_type returned by SATA HBA driver specifies Port Multiplier being connected. --- 148,165 ---- determined. ! satadev_scr.sstatus, ! satadev_scr.serror, ! satadev_scr.scontrol, ! satadev_scr.sactive, ! satadev_scr.snotific These fields should be set by SATA HBA driver to the same value as their equivalent registers in the port SCR register block (see Serial ATA II specification). ! ! satadev_num_info Function-specific informational value, for example: ! For sata_tran_probe_port() this field may contain the number of device ports on the Port Multiplier, if an attached device dev_type returned by SATA HBA driver specifies Port Multiplier being connected.