[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

zrouter-src-freebsd at zrouter.org zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:39:21 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/1e39889b0785
changeset: 383:1e39889b0785
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:10:07 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/dev/isci/environment.h                                            |   2 +-
 head/sys/dev/isci/isci.c                                                   |  10 +-
 head/sys/dev/isci/isci.h                                                   |   3 +-
 head/sys/dev/isci/isci_controller.c                                        |   4 +-
 head/sys/dev/isci/isci_domain.c                                            |   2 +-
 head/sys/dev/isci/isci_interrupt.c                                         |   2 +-
 head/sys/dev/isci/isci_io_request.c                                        |  14 +-
 head/sys/dev/isci/isci_logger.c                                            |   2 +-
 head/sys/dev/isci/isci_oem_parameters.c                                    |   2 +-
 head/sys/dev/isci/isci_remote_device.c                                     |   6 +-
 head/sys/dev/isci/isci_sysctl.c                                            |   2 +-
 head/sys/dev/isci/isci_task_request.c                                      |   2 +-
 head/sys/dev/isci/isci_timer.c                                             |   2 +-
 head/sys/dev/isci/scil/intel_ata.h                                         |   2 +-
 head/sys/dev/isci/scil/intel_pci.h                                         |   2 +-
 head/sys/dev/isci/scil/intel_sas.h                                         |   2 +-
 head/sys/dev/isci/scil/intel_sat.h                                         |   2 +-
 head/sys/dev/isci/scil/intel_sata.h                                        |   2 +-
 head/sys/dev/isci/scil/intel_scsi.h                                        |   2 +-
 head/sys/dev/isci/scil/sati.c                                              |   2 +-
 head/sys/dev/isci/scil/sati.h                                              |   2 +-
 head/sys/dev/isci/scil/sati_abort_task_set.c                               |  10 +-
 head/sys/dev/isci/scil/sati_abort_task_set.h                               |   2 +-
 head/sys/dev/isci/scil/sati_atapi.c                                        |   2 +-
 head/sys/dev/isci/scil/sati_atapi.h                                        |   2 +-
 head/sys/dev/isci/scil/sati_callbacks.h                                    |   2 +-
 head/sys/dev/isci/scil/sati_design.h                                       |   2 +-
 head/sys/dev/isci/scil/sati_device.c                                       |   2 +-
 head/sys/dev/isci/scil/sati_device.h                                       |   2 +-
 head/sys/dev/isci/scil/sati_inquiry.c                                      |   2 +-
 head/sys/dev/isci/scil/sati_inquiry.h                                      |   2 +-
 head/sys/dev/isci/scil/sati_log_sense.c                                    |   2 +-
 head/sys/dev/isci/scil/sati_log_sense.h                                    |   2 +-
 head/sys/dev/isci/scil/sati_lun_reset.c                                    |   2 +-
 head/sys/dev/isci/scil/sati_lun_reset.h                                    |   2 +-
 head/sys/dev/isci/scil/sati_mode_pages.c                                   |   2 +-
 head/sys/dev/isci/scil/sati_mode_pages.h                                   |   2 +-
 head/sys/dev/isci/scil/sati_mode_select.c                                  |   2 +-
 head/sys/dev/isci/scil/sati_mode_select.h                                  |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense.c                                   |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense.h                                   |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense_10.c                                |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense_10.h                                |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense_6.c                                 |   2 +-
 head/sys/dev/isci/scil/sati_mode_sense_6.h                                 |   2 +-
 head/sys/dev/isci/scil/sati_move.c                                         |   2 +-
 head/sys/dev/isci/scil/sati_move.h                                         |   2 +-
 head/sys/dev/isci/scil/sati_passthrough.c                                  |   2 +-
 head/sys/dev/isci/scil/sati_passthrough.h                                  |   2 +-
 head/sys/dev/isci/scil/sati_read.c                                         |   2 +-
 head/sys/dev/isci/scil/sati_read.h                                         |   2 +-
 head/sys/dev/isci/scil/sati_read_buffer.c                                  |   2 +-
 head/sys/dev/isci/scil/sati_read_buffer.h                                  |   2 +-
 head/sys/dev/isci/scil/sati_read_capacity.c                                |   2 +-
 head/sys/dev/isci/scil/sati_read_capacity.h                                |   2 +-
 head/sys/dev/isci/scil/sati_reassign_blocks.c                              |   2 +-
 head/sys/dev/isci/scil/sati_reassign_blocks.h                              |   2 +-
 head/sys/dev/isci/scil/sati_report_luns.c                                  |   2 +-
 head/sys/dev/isci/scil/sati_report_luns.h                                  |   2 +-
 head/sys/dev/isci/scil/sati_request_sense.c                                |   2 +-
 head/sys/dev/isci/scil/sati_request_sense.h                                |   2 +-
 head/sys/dev/isci/scil/sati_start_stop_unit.c                              |   2 +-
 head/sys/dev/isci/scil/sati_start_stop_unit.h                              |   2 +-
 head/sys/dev/isci/scil/sati_synchronize_cache.c                            |   2 +-
 head/sys/dev/isci/scil/sati_synchronize_cache.h                            |   2 +-
 head/sys/dev/isci/scil/sati_test_unit_ready.c                              |   2 +-
 head/sys/dev/isci/scil/sati_test_unit_ready.h                              |   2 +-
 head/sys/dev/isci/scil/sati_translator_sequence.h                          |   2 +-
 head/sys/dev/isci/scil/sati_types.h                                        |   2 +-
 head/sys/dev/isci/scil/sati_unmap.c                                        |   2 +-
 head/sys/dev/isci/scil/sati_unmap.h                                        |   2 +-
 head/sys/dev/isci/scil/sati_util.c                                         |   2 +-
 head/sys/dev/isci/scil/sati_util.h                                         |   2 +-
 head/sys/dev/isci/scil/sati_verify.c                                       |   2 +-
 head/sys/dev/isci/scil/sati_verify.h                                       |   2 +-
 head/sys/dev/isci/scil/sati_write.c                                        |   2 +-
 head/sys/dev/isci/scil/sati_write.h                                        |   2 +-
 head/sys/dev/isci/scil/sati_write_and_verify.c                             |   2 +-
 head/sys/dev/isci/scil/sati_write_and_verify.h                             |   2 +-
 head/sys/dev/isci/scil/sati_write_buffer.c                                 |   2 +-
 head/sys/dev/isci/scil/sati_write_buffer.h                                 |   2 +-
 head/sys/dev/isci/scil/sati_write_long.c                                   |   2 +-
 head/sys/dev/isci/scil/sati_write_long.h                                   |   2 +-
 head/sys/dev/isci/scil/sci_abstract_list.c                                 |   2 +-
 head/sys/dev/isci/scil/sci_abstract_list.h                                 |   2 +-
 head/sys/dev/isci/scil/sci_base_controller.c                               |   2 +-
 head/sys/dev/isci/scil/sci_base_controller.h                               |   2 +-
 head/sys/dev/isci/scil/sci_base_domain.c                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_domain.h                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_iterator.c                                 |   2 +-
 head/sys/dev/isci/scil/sci_base_iterator.h                                 |   2 +-
 head/sys/dev/isci/scil/sci_base_library.c                                  |   2 +-
 head/sys/dev/isci/scil/sci_base_library.h                                  |   2 +-
 head/sys/dev/isci/scil/sci_base_logger.c                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_logger.h                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c                   |   2 +-
 head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h                   |   2 +-
 head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c         |   2 +-
 head/sys/dev/isci/scil/sci_base_object.c                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_object.h                                   |   2 +-
 head/sys/dev/isci/scil/sci_base_observer.c                                 |   2 +-
 head/sys/dev/isci/scil/sci_base_observer.h                                 |   2 +-
 head/sys/dev/isci/scil/sci_base_phy.c                                      |   2 +-
 head/sys/dev/isci/scil/sci_base_phy.h                                      |   2 +-
 head/sys/dev/isci/scil/sci_base_port.c                                     |   2 +-
 head/sys/dev/isci/scil/sci_base_port.h                                     |   2 +-
 head/sys/dev/isci/scil/sci_base_remote_device.c                            |   2 +-
 head/sys/dev/isci/scil/sci_base_remote_device.h                            |   2 +-
 head/sys/dev/isci/scil/sci_base_request.c                                  |   2 +-
 head/sys/dev/isci/scil/sci_base_request.h                                  |   2 +-
 head/sys/dev/isci/scil/sci_base_state.h                                    |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine.c                            |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine.h                            |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine_logger.c                     |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine_logger.h                     |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine_observer.c                   |   2 +-
 head/sys/dev/isci/scil/sci_base_state_machine_observer.h                   |   2 +-
 head/sys/dev/isci/scil/sci_base_subject.c                                  |   2 +-
 head/sys/dev/isci/scil/sci_base_subject.h                                  |   2 +-
 head/sys/dev/isci/scil/sci_controller.h                                    |   2 +-
 head/sys/dev/isci/scil/sci_controller_constants.h                          |   2 +-
 head/sys/dev/isci/scil/sci_fast_list.h                                     |   2 +-
 head/sys/dev/isci/scil/sci_iterator.h                                      |   2 +-
 head/sys/dev/isci/scil/sci_library.h                                       |   2 +-
 head/sys/dev/isci/scil/sci_logger.h                                        |   2 +-
 head/sys/dev/isci/scil/sci_memory_descriptor_list.h                        |   2 +-
 head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h              |   2 +-
 head/sys/dev/isci/scil/sci_object.h                                        |   2 +-
 head/sys/dev/isci/scil/sci_overview.h                                      |   2 +-
 head/sys/dev/isci/scil/sci_pool.h                                          |   2 +-
 head/sys/dev/isci/scil/sci_simple_list.h                                   |   2 +-
 head/sys/dev/isci/scil/sci_status.h                                        |   2 +-
 head/sys/dev/isci/scil/sci_types.h                                         |   2 +-
 head/sys/dev/isci/scil/sci_util.c                                          |   2 +-
 head/sys/dev/isci/scil/sci_util.h                                          |   2 +-
 head/sys/dev/isci/scil/scic_config_parameters.h                            |   2 +-
 head/sys/dev/isci/scil/scic_controller.h                                   |   2 +-
 head/sys/dev/isci/scil/scic_io_request.h                                   |   2 +-
 head/sys/dev/isci/scil/scic_library.h                                      |   2 +-
 head/sys/dev/isci/scil/scic_logger.h                                       |   2 +-
 head/sys/dev/isci/scil/scic_overview.h                                     |   2 +-
 head/sys/dev/isci/scil/scic_phy.h                                          |   2 +-
 head/sys/dev/isci/scil/scic_port.h                                         |   2 +-
 head/sys/dev/isci/scil/scic_remote_device.h                                |   2 +-
 head/sys/dev/isci/scil/scic_sds_controller.c                               |  10 +-
 head/sys/dev/isci/scil/scic_sds_controller.h                               |   2 +-
 head/sys/dev/isci/scil/scic_sds_controller_registers.h                     |   2 +-
 head/sys/dev/isci/scil/scic_sds_library.c                                  |   2 +-
 head/sys/dev/isci/scil/scic_sds_library.h                                  |   2 +-
 head/sys/dev/isci/scil/scic_sds_logger.h                                   |   2 +-
 head/sys/dev/isci/scil/scic_sds_pci.c                                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_pci.h                                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_phy.c                                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_phy.h                                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_phy_registers.h                            |   2 +-
 head/sys/dev/isci/scil/scic_sds_port.c                                     |   2 +-
 head/sys/dev/isci/scil/scic_sds_port.h                                     |   2 +-
 head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c                 |   2 +-
 head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h                 |   2 +-
 head/sys/dev/isci/scil/scic_sds_port_registers.h                           |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_device.c                            |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_device.h                            |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_node_context.c                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_node_context.h                      |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_node_table.c                        |   2 +-
 head/sys/dev/isci/scil/scic_sds_remote_node_table.h                        |   2 +-
 head/sys/dev/isci/scil/scic_sds_request.c                                  |   2 +-
 head/sys/dev/isci/scil/scic_sds_request.h                                  |   2 +-
 head/sys/dev/isci/scil/scic_sds_sgpio.c                                    |   2 +-
 head/sys/dev/isci/scil/scic_sds_smp_remote_device.c                        |   2 +-
 head/sys/dev/isci/scil/scic_sds_smp_request.c                              |   2 +-
 head/sys/dev/isci/scil/scic_sds_smp_request.h                              |   2 +-
 head/sys/dev/isci/scil/scic_sds_ssp_request.c                              |   2 +-
 head/sys/dev/isci/scil/scic_sds_stp_packet_request.c                       |   2 +-
 head/sys/dev/isci/scil/scic_sds_stp_packet_request.h                       |   2 +-
 head/sys/dev/isci/scil/scic_sds_stp_pio_request.h                          |   2 +-
 head/sys/dev/isci/scil/scic_sds_stp_remote_device.c                        |   2 +-
 head/sys/dev/isci/scil/scic_sds_stp_request.c                              |   5 +-
 head/sys/dev/isci/scil/scic_sds_stp_request.h                              |   2 +-
 head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c                |   2 +-
 head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h                |   2 +-
 head/sys/dev/isci/scil/scic_sgpio.h                                        |   2 +-
 head/sys/dev/isci/scil/scic_task_request.h                                 |   2 +-
 head/sys/dev/isci/scil/scic_user_callback.h                                |   2 +-
 head/sys/dev/isci/scil/scif_config_parameters.h                            |   2 +-
 head/sys/dev/isci/scil/scif_controller.h                                   |   2 +-
 head/sys/dev/isci/scil/scif_domain.h                                       |   2 +-
 head/sys/dev/isci/scil/scif_io_request.h                                   |   2 +-
 head/sys/dev/isci/scil/scif_library.h                                      |   2 +-
 head/sys/dev/isci/scil/scif_logger.h                                       |   2 +-
 head/sys/dev/isci/scil/scif_overview.h                                     |   2 +-
 head/sys/dev/isci/scil/scif_remote_device.h                                |   2 +-
 head/sys/dev/isci/scil/scif_sas_constants.h                                |   2 +-
 head/sys/dev/isci/scil/scif_sas_controller.c                               |  86 +++++----
 head/sys/dev/isci/scil/scif_sas_controller.h                               |   2 +-
 head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c                |  10 +-
 head/sys/dev/isci/scil/scif_sas_controller_states.c                        |   2 +-
 head/sys/dev/isci/scil/scif_sas_design.h                                   |   2 +-
 head/sys/dev/isci/scil/scif_sas_domain.c                                   |   8 +-
 head/sys/dev/isci/scil/scif_sas_domain.h                                   |   2 +-
 head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c                    |   2 +-
 head/sys/dev/isci/scil/scif_sas_domain_states.c                            |   2 +-
 head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c              |   2 +-
 head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h              |   2 +-
 head/sys/dev/isci/scil/scif_sas_internal_io_request.c                      |   2 +-
 head/sys/dev/isci/scil/scif_sas_internal_io_request.h                      |   2 +-
 head/sys/dev/isci/scil/scif_sas_io_request.c                               |   4 +-
 head/sys/dev/isci/scil/scif_sas_io_request.h                               |   2 +-
 head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c                |   2 +-
 head/sys/dev/isci/scil/scif_sas_io_request_states.c                        |   2 +-
 head/sys/dev/isci/scil/scif_sas_library.c                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_library.h                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_logger.h                                   |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device.c                            |   8 +-
 head/sys/dev/isci/scil/scif_sas_remote_device.h                            |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c    |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c            |   4 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c         |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c             |   2 +-
 head/sys/dev/isci/scil/scif_sas_remote_device_states.c                     |   2 +-
 head/sys/dev/isci/scil/scif_sas_request.c                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_request.h                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_sati_binding.h                             |   2 +-
 head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c           |   2 +-
 head/sys/dev/isci/scil/scif_sas_smp_io_request.c                           |   4 +-
 head/sys/dev/isci/scil/scif_sas_smp_io_request.h                           |   2 +-
 head/sys/dev/isci/scil/scif_sas_smp_phy.c                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_smp_phy.h                                  |   2 +-
 head/sys/dev/isci/scil/scif_sas_smp_remote_device.c                        |  30 +--
 head/sys/dev/isci/scil/scif_sas_smp_remote_device.h                        |   2 +-
 head/sys/dev/isci/scil/scif_sas_stp_io_request.c                           |   4 +-
 head/sys/dev/isci/scil/scif_sas_stp_io_request.h                           |   2 +-
 head/sys/dev/isci/scil/scif_sas_stp_remote_device.c                        |   2 +-
 head/sys/dev/isci/scil/scif_sas_stp_remote_device.h                        |   2 +-
 head/sys/dev/isci/scil/scif_sas_stp_task_request.c                         |   4 +-
 head/sys/dev/isci/scil/scif_sas_stp_task_request.h                         |   2 +-
 head/sys/dev/isci/scil/scif_sas_task_request.c                             |   2 +-
 head/sys/dev/isci/scil/scif_sas_task_request.h                             |   2 +-
 head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c              |   2 +-
 head/sys/dev/isci/scil/scif_sas_task_request_states.c                      |   2 +-
 head/sys/dev/isci/scil/scif_sas_timer.c                                    |   2 +-
 head/sys/dev/isci/scil/scif_task_request.h                                 |   2 +-
 head/sys/dev/isci/scil/scif_user_callback.h                                |   2 +-
 head/sys/dev/isci/scil/scu_bios_definitions.h                              |   2 +-
 head/sys/dev/isci/scil/scu_completion_codes.h                              |   2 +-
 head/sys/dev/isci/scil/scu_constants.h                                     |   2 +-
 head/sys/dev/isci/scil/scu_event_codes.h                                   |   2 +-
 head/sys/dev/isci/scil/scu_registers.h                                     |   2 +-
 head/sys/dev/isci/scil/scu_remote_node_context.h                           |   2 +-
 head/sys/dev/isci/scil/scu_task_context.h                                  |   2 +-
 head/sys/dev/isci/scil/scu_unsolicited_frame.h                             |   2 +-
 head/sys/dev/isci/scil/scu_viit_data.h                                     |   2 +-
 head/sys/dev/isci/types.h                                                  |   2 +-
 254 files changed, 347 insertions(+), 349 deletions(-)

diffs (3631 lines):

diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/environment.h
--- a/head/sys/dev/isci/environment.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/environment.h	Fri Mar 02 17:10:07 2012 +0200
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/environment.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 
 #ifndef ENVIRONMENT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci.c
--- a/head/sys/dev/isci/isci.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci.c 232225 2012-02-27 17:04:18Z sbruno $");
 
 #include <dev/isci/isci.h>
 
@@ -98,7 +98,11 @@
 	 { 0x1d688086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d698086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6a8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
-	 { 0x1d6b8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
+	 { 0x1d6b8086,  "Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
+	 { 0x1d6c8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6d8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6e8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6f8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x00000000,	NULL				}
 };
 
@@ -114,7 +118,7 @@
 	if (ep->desc)
 	{
 		device_set_desc(device, ep->desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	else
 		return (ENXIO);
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci.h
--- a/head/sys/dev/isci/isci.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci.h	Fri Mar 02 17:10:07 2012 +0200
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/isci.h 231296 2012-02-09 17:50:24Z jimharris $
  */
 
 #include <sys/param.h>
@@ -160,7 +160,6 @@
 struct ISCI_IO_REQUEST
 {
 	struct ISCI_REQUEST	parent;
-	SCI_STATUS		status;
 	SCI_IO_REQUEST_HANDLE_T	sci_object;
 	union ccb		*ccb;
 	uint32_t		num_segments;
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_controller.c
--- a/head/sys/dev/isci/isci_controller.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_controller.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_controller.c 231860 2012-02-17 06:47:16Z sbruno $");
 
 #include <dev/isci/isci.h>
 
@@ -549,7 +549,7 @@
 			cpi->hba_eng_cnt = 0;
 			cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1;
 			cpi->max_lun = ISCI_MAX_LUN;
-#if __FreeBSD_version >= 704100
+#if __FreeBSD_version >= 800102
 			cpi->maxio = isci_io_request_get_max_io_size();
 #endif
 			cpi->unit_number = cam_sim_unit(sim);
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_domain.c
--- a/head/sys/dev/isci/isci_domain.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_domain.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_domain.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_interrupt.c
--- a/head/sys/dev/isci/isci_interrupt.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_interrupt.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_interrupt.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_io_request.c
--- a/head/sys/dev/isci/isci_io_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_io_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_io_request.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 #include <dev/isci/isci.h>
 
@@ -626,16 +626,16 @@
 		return;
 	}
 
-	io_request->status = scif_io_request_construct(
+	status = scif_io_request_construct(
 	    io_request->parent.controller_handle,
 	    io_request->parent.remote_device_handle,
 	    SCI_CONTROLLER_INVALID_IO_TAG, (void *)io_request,
 	    (void *)((char*)io_request + sizeof(struct ISCI_IO_REQUEST)),
 	    &io_request->sci_object);
 
-	if (io_request->status != SCI_SUCCESS) {
+	if (status != SCI_SUCCESS) {
 		isci_io_request_complete(io_request->parent.controller_handle,
-		    device, io_request, io_request->status);
+		    device, io_request, (SCI_IO_STATUS)status);
 		return;
 	}
 
@@ -650,7 +650,7 @@
 
 	if (status != SCI_SUCCESS) {
 		isci_io_request_complete(io_request->parent.controller_handle,
-		    device, io_request, status);
+		    device, io_request, (SCI_IO_STATUS)status);
 		return;
 	}
 
@@ -900,7 +900,7 @@
 
 	if (status != SCI_SUCCESS) {
 		isci_io_request_complete(controller->scif_controller_handle,
-		    smp_device_handle, io_request, status);
+		    smp_device_handle, io_request, (SCI_IO_STATUS)status);
 		return;
 	}
 
@@ -912,7 +912,7 @@
 
 	if (status != SCI_SUCCESS) {
 		isci_io_request_complete(controller->scif_controller_handle,
-		    smp_device_handle, io_request, status);
+		    smp_device_handle, io_request, (SCI_IO_STATUS)status);
 		return;
 	}
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_logger.c
--- a/head/sys/dev/isci/isci_logger.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_logger.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_logger.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_oem_parameters.c
--- a/head/sys/dev/isci/isci_oem_parameters.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_oem_parameters.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_oem_parameters.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 #include <vm/vm.h>
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_remote_device.c
--- a/head/sys/dev/isci/isci_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_remote_device.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 #include <dev/isci/isci.h>
 
@@ -195,7 +195,7 @@
 	if (status != SCI_SUCCESS) {
 		isci_task_request_complete(controller->scif_controller_handle,
 		    remote_device->sci_object, task_request->sci_object,
-		    status);
+		    (SCI_TASK_STATUS)status);
 		return;
 	}
 
@@ -207,7 +207,7 @@
 		isci_task_request_complete(
 		    controller->scif_controller_handle,
 		    remote_device->sci_object, task_request->sci_object,
-		    status);
+		    (SCI_TASK_STATUS)status);
 		return;
 	}
 }
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_sysctl.c
--- a/head/sys/dev/isci/isci_sysctl.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_sysctl.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_sysctl.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_task_request.c
--- a/head/sys/dev/isci/isci_task_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_task_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_task_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/isci_timer.c
--- a/head/sys/dev/isci/isci_timer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/isci_timer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/isci_timer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/isci.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_ata.h
--- a/head/sys/dev/isci/scil/intel_ata.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_ata.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_ata.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_pci.h
--- a/head/sys/dev/isci/scil/intel_pci.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_pci.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_pci.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _INTEL_PCI_H_
 #define _INTEL_PCI_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_sas.h
--- a/head/sys/dev/isci/scil/intel_sas.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_sas.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_sas.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _INTEL_SAS_H_
 #define _INTEL_SAS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_sat.h
--- a/head/sys/dev/isci/scil/intel_sat.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_sat.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_sat.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SAT_H_
 #define _SAT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_sata.h
--- a/head/sys/dev/isci/scil/intel_sata.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_sata.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_sata.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATA_H_
 #define _SATA_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/intel_scsi.h
--- a/head/sys/dev/isci/scil/intel_scsi.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/intel_scsi.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/intel_scsi.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati.c
--- a/head/sys/dev/isci/scil/sati.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati.h
--- a/head/sys/dev/isci/scil/sati.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_H_
 #define _SATI_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_abort_task_set.c
--- a/head/sys/dev/isci/scil/sati_abort_task_set.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_abort_task_set.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_abort_task_set.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -124,8 +124,8 @@
 
    for (tag_index = 0; tag_index < 32; tag_index++)
    {
-      void     * matching_command;
-      SCI_STATUS completion_status;
+      void *        matching_command;
+      SCI_IO_STATUS completion_status;
       sati_cb_device_get_request_by_ncq_tag(
          scsi_task,
          tag_index,
@@ -141,7 +141,7 @@
             )
          {
             sati_translate_error(sequence, matching_command, log->error);
-            completion_status = SCI_FAILURE_IO_RESPONSE_VALID;
+            completion_status = SCI_IO_FAILURE_RESPONSE_VALID;
 
             if(sequence->state == SATI_SEQUENCE_STATE_READ_ERROR)
             {
@@ -159,7 +159,7 @@
          }
          else
          {
-            completion_status = SCI_FAILURE_IO_TERMINATED;
+            completion_status = SCI_IO_FAILURE_TERMINATED;
          }
 
          sati_cb_io_request_complete(matching_command, completion_status);
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_abort_task_set.h
--- a/head/sys/dev/isci/scil/sati_abort_task_set.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_abort_task_set.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_abort_task_set.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_ABORT_TASK_SET_H_
 #define _SATI_ABORT_TASK_SET_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_atapi.c
--- a/head/sys/dev/isci/scil/sati_atapi.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_atapi.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_atapi.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_atapi.h
--- a/head/sys/dev/isci/scil/sati_atapi.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_atapi.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_atapi.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_ATAPI_H_
 #define _SATI_ATAPI_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_callbacks.h
--- a/head/sys/dev/isci/scil/sati_callbacks.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_callbacks.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_callbacks.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_CALLBACKS_H_
 #define _SATI_CALLBACKS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_design.h
--- a/head/sys/dev/isci/scil/sati_design.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_design.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_design.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_DESIGN_H_
 #define _SATI_DESIGN_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_device.c
--- a/head/sys/dev/isci/scil/sati_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_device.h
--- a/head/sys/dev/isci/scil/sati_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_DEVICE_H_
 #define _SATI_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_inquiry.c
--- a/head/sys/dev/isci/scil/sati_inquiry.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_inquiry.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_inquiry.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_inquiry.h
--- a/head/sys/dev/isci/scil/sati_inquiry.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_inquiry.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_inquiry.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_INQUIRY_H_
 #define _SATI_INQUIRY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_log_sense.c
--- a/head/sys/dev/isci/scil/sati_log_sense.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_log_sense.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_log_sense.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_log_sense.h
--- a/head/sys/dev/isci/scil/sati_log_sense.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_log_sense.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_log_sense.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_lun_reset.c
--- a/head/sys/dev/isci/scil/sati_lun_reset.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_lun_reset.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_lun_reset.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_lun_reset.h
--- a/head/sys/dev/isci/scil/sati_lun_reset.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_lun_reset.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_lun_reset.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_LUN_RESET_H_
 #define _SATI_LUN_RESET_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_pages.c
--- a/head/sys/dev/isci/scil/sati_mode_pages.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_pages.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_mode_pages.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_pages.h
--- a/head/sys/dev/isci/scil/sati_mode_pages.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_pages.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_mode_pages.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_select.c
--- a/head/sys/dev/isci/scil/sati_mode_select.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_select.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_mode_select.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_select.h
--- a/head/sys/dev/isci/scil/sati_mode_select.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_select.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_mode_select.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_MODE_SELECT_H_
 #define _SATI_MODE_SELECT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense.c
--- a/head/sys/dev/isci/scil/sati_mode_sense.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_mode_sense.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense.h
--- a/head/sys/dev/isci/scil/sati_mode_sense.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_mode_sense.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_MODE_SENSE_H_
 #define _SATI_MODE_SENSE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense_10.c
--- a/head/sys/dev/isci/scil/sati_mode_sense_10.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense_10.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_mode_sense_10.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense_10.h
--- a/head/sys/dev/isci/scil/sati_mode_sense_10.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense_10.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_mode_sense_10.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_MODE_SENSE_10_H_
 #define _SATI_MODE_SENSE_10_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense_6.c
--- a/head/sys/dev/isci/scil/sati_mode_sense_6.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense_6.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_mode_sense_6.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_mode_sense_6.h
--- a/head/sys/dev/isci/scil/sati_mode_sense_6.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_mode_sense_6.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_mode_sense_6.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_MODE_SENSE_6_H_
 #define _SATI_MODE_SENSE_6_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_move.c
--- a/head/sys/dev/isci/scil/sati_move.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_move.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_move.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_move.h
--- a/head/sys/dev/isci/scil/sati_move.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_move.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_move.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_MOVE_H_
 #define _SATI_MOVE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_passthrough.c
--- a/head/sys/dev/isci/scil/sati_passthrough.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_passthrough.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_passthrough.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_passthrough.h
--- a/head/sys/dev/isci/scil/sati_passthrough.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_passthrough.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_passthrough.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_PASSTHROUGH_H_
 #define _SATI_PASSTHROUGH_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read.c
--- a/head/sys/dev/isci/scil/sati_read.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_read.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read.h
--- a/head/sys/dev/isci/scil/sati_read.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_read.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_READ_H_
 #define _SATI_READ_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read_buffer.c
--- a/head/sys/dev/isci/scil/sati_read_buffer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read_buffer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_read_buffer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read_buffer.h
--- a/head/sys/dev/isci/scil/sati_read_buffer.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read_buffer.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_read_buffer.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read_capacity.c
--- a/head/sys/dev/isci/scil/sati_read_capacity.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read_capacity.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_read_capacity.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_read_capacity.h
--- a/head/sys/dev/isci/scil/sati_read_capacity.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_read_capacity.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_read_capacity.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_READ_CAPACITY_H_
 #define _SATI_READ_CAPACITY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_reassign_blocks.c
--- a/head/sys/dev/isci/scil/sati_reassign_blocks.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_reassign_blocks.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_reassign_blocks.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_reassign_blocks.h
--- a/head/sys/dev/isci/scil/sati_reassign_blocks.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_reassign_blocks.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_reassign_blocks.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_REASSIGN_BLOCKS_H_
 #define _SATI_REASSIGN_BLOCKS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_report_luns.c
--- a/head/sys/dev/isci/scil/sati_report_luns.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_report_luns.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_report_luns.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_report_luns.h
--- a/head/sys/dev/isci/scil/sati_report_luns.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_report_luns.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_report_luns.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_REPORT_LUNS_H_
 #define _SATI_REPORT_LUNS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_request_sense.c
--- a/head/sys/dev/isci/scil/sati_request_sense.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_request_sense.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_request_sense.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_request_sense.h
--- a/head/sys/dev/isci/scil/sati_request_sense.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_request_sense.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_request_sense.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_start_stop_unit.c
--- a/head/sys/dev/isci/scil/sati_start_stop_unit.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_start_stop_unit.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_start_stop_unit.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_start_stop_unit.h
--- a/head/sys/dev/isci/scil/sati_start_stop_unit.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_start_stop_unit.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_start_stop_unit.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_START_STOP_UNIT_H_
 #define _SATI_START_STOP_UNIT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_synchronize_cache.c
--- a/head/sys/dev/isci/scil/sati_synchronize_cache.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_synchronize_cache.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_synchronize_cache.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_synchronize_cache.h
--- a/head/sys/dev/isci/scil/sati_synchronize_cache.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_synchronize_cache.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_synchronize_cache.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_SYNCHRONIZE_CACHE_H_
 #define _SATI_SYNCHRONIZE_CACHE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_test_unit_ready.c
--- a/head/sys/dev/isci/scil/sati_test_unit_ready.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_test_unit_ready.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_test_unit_ready.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_test_unit_ready.h
--- a/head/sys/dev/isci/scil/sati_test_unit_ready.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_test_unit_ready.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_test_unit_ready.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_TEST_UNIT_READY_H_
 #define _SATI_TEST_UNIT_READY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_translator_sequence.h
--- a/head/sys/dev/isci/scil/sati_translator_sequence.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_translator_sequence.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_translator_sequence.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_TRANSLATOR_SEQUENCE_H_
 #define _SATI_TRANSLATOR_SEQUENCE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_types.h
--- a/head/sys/dev/isci/scil/sati_types.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_types.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_types.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_TYPES_H_
 #define _SATI_TYPES_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_unmap.c
--- a/head/sys/dev/isci/scil/sati_unmap.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_unmap.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_unmap.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_unmap.h
--- a/head/sys/dev/isci/scil/sati_unmap.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_unmap.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_unmap.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_UNMAP_H_
 #define _SATI_UNMAP_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_util.c
--- a/head/sys/dev/isci/scil/sati_util.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_util.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_util.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_util.h
--- a/head/sys/dev/isci/scil/sati_util.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_util.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_util.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_UTIL_H_
 #define _SATI_UTIL_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_verify.c
--- a/head/sys/dev/isci/scil/sati_verify.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_verify.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_verify.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_verify.h
--- a/head/sys/dev/isci/scil/sati_verify.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_verify.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_verify.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_VERIFY_H_
 #define _SATI_VERIFY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write.c
--- a/head/sys/dev/isci/scil/sati_write.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_write.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write.h
--- a/head/sys/dev/isci/scil/sati_write.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_write.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SATI_WRITE_H_
 #define _SATI_WRITE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_and_verify.c
--- a/head/sys/dev/isci/scil/sati_write_and_verify.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_and_verify.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_write_and_verify.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_and_verify.h
--- a/head/sys/dev/isci/scil/sati_write_and_verify.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_and_verify.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_write_and_verify.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_buffer.c
--- a/head/sys/dev/isci/scil/sati_write_buffer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_buffer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_write_buffer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_buffer.h
--- a/head/sys/dev/isci/scil/sati_write_buffer.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_buffer.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_write_buffer.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_long.c
--- a/head/sys/dev/isci/scil/sati_write_long.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_long.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sati_write_long.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sati_write_long.h
--- a/head/sys/dev/isci/scil/sati_write_long.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sati_write_long.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sati_write_long.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_abstract_list.c
--- a/head/sys/dev/isci/scil/sci_abstract_list.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_abstract_list.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_abstract_list.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_abstract_list.h
--- a/head/sys/dev/isci/scil/sci_abstract_list.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_abstract_list.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_abstract_list.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_controller.c
--- a/head/sys/dev/isci/scil/sci_base_controller.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_controller.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_controller.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_controller.h
--- a/head/sys/dev/isci/scil/sci_base_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_CONTROLLER_H_
 #define _SCI_BASE_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_domain.c
--- a/head/sys/dev/isci/scil/sci_base_domain.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_domain.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_domain.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_domain.h
--- a/head/sys/dev/isci/scil/sci_base_domain.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_domain.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_domain.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_DOMAIN_H_
 #define _SCI_BASE_DOMAIN_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_iterator.c
--- a/head/sys/dev/isci/scil/sci_base_iterator.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_iterator.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_iterator.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_iterator.h
--- a/head/sys/dev/isci/scil/sci_base_iterator.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_iterator.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_iterator.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_library.c
--- a/head/sys/dev/isci/scil/sci_base_library.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_library.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_library.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_library.h
--- a/head/sys/dev/isci/scil/sci_base_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_LIBRARY_H_
 #define _SCI_BASE_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_logger.c
--- a/head/sys/dev/isci/scil/sci_base_logger.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_logger.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_logger.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_logger.h
--- a/head/sys/dev/isci/scil/sci_base_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_LOGGER_H_
 #define _SCI_BASE_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c
--- a/head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h
--- a/head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_MEMORY_DESCRIPTOR_LIST_H_
 #define _SCI_BASE_MEMORY_DESCRIPTOR_LIST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c
--- a/head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_object.c
--- a/head/sys/dev/isci/scil/sci_base_object.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_object.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_object.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_object.h
--- a/head/sys/dev/isci/scil/sci_base_object.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_object.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_object.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_OBJECT_H_
 #define _SCI_BASE_OBJECT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_observer.c
--- a/head/sys/dev/isci/scil/sci_base_observer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_observer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_observer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_observer.h
--- a/head/sys/dev/isci/scil/sci_base_observer.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_observer.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_observer.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_OBSERVER_H_
 #define _SCI_BASE_OBSERVER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_phy.c
--- a/head/sys/dev/isci/scil/sci_base_phy.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_phy.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_phy.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_phy.h
--- a/head/sys/dev/isci/scil/sci_base_phy.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_phy.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_phy.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_PHY_H_
 #define _SCI_BASE_PHY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_port.c
--- a/head/sys/dev/isci/scil/sci_base_port.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_port.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_port.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_port.h
--- a/head/sys/dev/isci/scil/sci_base_port.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_port.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_port.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_PORT_H_
 #define _SCI_BASE_PORT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_remote_device.c
--- a/head/sys/dev/isci/scil/sci_base_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_remote_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/scil/sci_base_remote_device.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_remote_device.h
--- a/head/sys/dev/isci/scil/sci_base_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_REMOTE_DEVICE_H_
 #define _SCI_BASE_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_request.c
--- a/head/sys/dev/isci/scil/sci_base_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/scil/sci_base_request.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_request.h
--- a/head/sys/dev/isci/scil/sci_base_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_REQUST_H_
 #define _SCI_BASE_REQUST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state.h
--- a/head/sys/dev/isci/scil/sci_base_state.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_state.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_STATE_H_
 #define _SCI_BASE_STATE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine.c
--- a/head/sys/dev/isci/scil/sci_base_state_machine.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine.h
--- a/head/sys/dev/isci/scil/sci_base_state_machine.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_STATE_MACHINE_H_
 #define _SCI_BASE_STATE_MACHINE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine_logger.c
--- a/head/sys/dev/isci/scil/sci_base_state_machine_logger.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine_logger.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine_logger.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine_logger.h
--- a/head/sys/dev/isci/scil/sci_base_state_machine_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_STATE_MACHINE_LOGGER_H_
 #define _SCI_BASE_STATE_MACHINE_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine_observer.c
--- a/head/sys/dev/isci/scil/sci_base_state_machine_observer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine_observer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine_observer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_state_machine_observer.h
--- a/head/sys/dev/isci/scil/sci_base_state_machine_observer.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_state_machine_observer.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_state_machine_observer.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_STATE_MACHINE_OBSERVER_H_
 #define _SCI_BASE_STATE_MACHINE_OBSERVER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_subject.c
--- a/head/sys/dev/isci/scil/sci_base_subject.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_subject.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_base_subject.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_base_subject.h
--- a/head/sys/dev/isci/scil/sci_base_subject.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_base_subject.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_base_subject.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_BASE_SUBJECT_H_
 #define _SCI_BASE_SUBJECT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_controller.h
--- a/head/sys/dev/isci/scil/sci_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_CONTROLLER_H_
 #define _SCI_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_controller_constants.h
--- a/head/sys/dev/isci/scil/sci_controller_constants.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_controller_constants.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_controller_constants.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_CONTROLLER_CONSTANTS_H_
 #define _SCI_CONTROLLER_CONSTANTS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_fast_list.h
--- a/head/sys/dev/isci/scil/sci_fast_list.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_fast_list.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_fast_list.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_FAST_LIST_HEADER_
 #define _SCI_FAST_LIST_HEADER_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_iterator.h
--- a/head/sys/dev/isci/scil/sci_iterator.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_iterator.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_iterator.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_library.h
--- a/head/sys/dev/isci/scil/sci_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_LIBRARY_H_
 #define _SCI_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_logger.h
--- a/head/sys/dev/isci/scil/sci_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_LOGGER_H_
 #define _SCI_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_memory_descriptor_list.h
--- a/head/sys/dev/isci/scil/sci_memory_descriptor_list.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_memory_descriptor_list.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_memory_descriptor_list.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_MEMORY_DESCRIPTOR_LIST_H_
 #define _SCI_MEMORY_DESCRIPTOR_LIST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h
--- a/head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_MEMORY_DESCRIPTOR_LIST_DECORATOR_H_
 #define _SCI_MEMORY_DESCRIPTOR_LIST_DECORATOR_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_object.h
--- a/head/sys/dev/isci/scil/sci_object.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_object.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_object.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_OBJECT_H_
 #define _SCI_OBJECT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_overview.h
--- a/head/sys/dev/isci/scil/sci_overview.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_overview.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_overview.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_OVERVIEW_H_
 #define _SCI_OVERVIEW_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_pool.h
--- a/head/sys/dev/isci/scil/sci_pool.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_pool.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_pool.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_simple_list.h
--- a/head/sys/dev/isci/scil/sci_simple_list.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_simple_list.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_simple_list.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_SIMPLE_LIST_HEADER_
 #define _SCI_SIMPLE_LIST_HEADER_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_status.h
--- a/head/sys/dev/isci/scil/sci_status.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_status.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_status.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_STATUS_H_
 #define _SCI_STATUS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_types.h
--- a/head/sys/dev/isci/scil/sci_types.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_types.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_types.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_TYPES_H_
 #define _SCI_TYPES_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_util.c
--- a/head/sys/dev/isci/scil/sci_util.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_util.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/sci_util.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/scil/sci_util.h>
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/sci_util.h
--- a/head/sys/dev/isci/scil/sci_util.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/sci_util.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/sci_util.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCI_UTIL_H_
 #define _SCI_UTIL_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_config_parameters.h
--- a/head/sys/dev/isci/scil/scic_config_parameters.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_config_parameters.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_config_parameters.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_USER_PARAMETERS_H_
 #define _SCIC_SDS_USER_PARAMETERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_controller.h
--- a/head/sys/dev/isci/scil/scic_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_CONTROLLER_H_
 #define _SCIC_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_io_request.h
--- a/head/sys/dev/isci/scil/scic_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_IO_REQUEST_H_
 #define _SCIC_IO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_library.h
--- a/head/sys/dev/isci/scil/scic_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_LIBRARY_H_
 #define _SCIC_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_logger.h
--- a/head/sys/dev/isci/scil/scic_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_LOGGER_H_
 #define _SCIC_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_overview.h
--- a/head/sys/dev/isci/scil/scic_overview.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_overview.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_overview.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_OVERVIEW_H_
 #define _SCIC_OVERVIEW_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_phy.h
--- a/head/sys/dev/isci/scil/scic_phy.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_phy.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_phy.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_PHY_H_
 #define _SCIC_PHY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_port.h
--- a/head/sys/dev/isci/scil/scic_port.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_port.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_port.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_PORT_H_
 #define _SCIC_PORT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_remote_device.h
--- a/head/sys/dev/isci/scil/scic_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_REMOTE_DEVICE_H_
 #define _SCIC_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_controller.c
--- a/head/sys/dev/isci/scil/scic_sds_controller.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_controller.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_controller.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -4165,7 +4165,7 @@
    U16                        io_tag
 )
 {
-   SCI_IO_STATUS          status;
+   SCI_STATUS          status;
    SCIC_SDS_CONTROLLER_T *this_controller;
    this_controller = (SCIC_SDS_CONTROLLER_T *)controller;
 
@@ -4183,7 +4183,7 @@
                io_tag
             );
 
-   return status;
+   return (SCI_IO_STATUS)status;
 }
 
 // ---------------------------------------------------------------------------
@@ -4253,7 +4253,7 @@
    U16                        task_tag
 )
 {
-   SCI_TASK_STATUS        status = SCI_FAILURE_INVALID_STATE;
+   SCI_STATUS             status = SCI_FAILURE_INVALID_STATE;
    SCIC_SDS_CONTROLLER_T *this_controller;
    this_controller = (SCIC_SDS_CONTROLLER_T *)controller;
 
@@ -4282,7 +4282,7 @@
       ));
    }
 
-   return status;
+   return (SCI_TASK_STATUS)status;
 }
 
 // ---------------------------------------------------------------------------
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_controller.h
--- a/head/sys/dev/isci/scil/scic_sds_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_CONTROLLER_H_
 #define _SCIC_SDS_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_controller_registers.h
--- a/head/sys/dev/isci/scil/scic_sds_controller_registers.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_controller_registers.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_controller_registers.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_CONTROLLER_REGISTERS_H_
 #define _SCIC_SDS_CONTROLLER_REGISTERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_library.c
--- a/head/sys/dev/isci/scil/scic_sds_library.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_library.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_library.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_library.h
--- a/head/sys/dev/isci/scil/scic_sds_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_LIBRARY_H_
 #define _SCIC_SDS_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_logger.h
--- a/head/sys/dev/isci/scil/scic_sds_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_LOGGER_H_
 #define _SCIC_SDS_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_pci.c
--- a/head/sys/dev/isci/scil/scic_sds_pci.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_pci.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_pci.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_pci.h
--- a/head/sys/dev/isci/scil/scic_sds_pci.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_pci.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_pci.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PCI_H_
 #define _SCIC_SDS_PCI_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_phy.c
--- a/head/sys/dev/isci/scil/scic_sds_phy.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_phy.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_phy.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_phy.h
--- a/head/sys/dev/isci/scil/scic_sds_phy.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_phy.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_phy.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PHY_H_
 #define _SCIC_SDS_PHY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_phy_registers.h
--- a/head/sys/dev/isci/scil/scic_sds_phy_registers.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_phy_registers.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_phy_registers.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PHY_REGISTERS_H_
 #define _SCIC_SDS_PHY_REGISTERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_port.c
--- a/head/sys/dev/isci/scil/scic_sds_port.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_port.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_port.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_port.h
--- a/head/sys/dev/isci/scil/scic_sds_port.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_port.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_port.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PORT_H_
 #define _SCIC_SDS_PORT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
--- a/head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h
--- a/head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PORT_CONFIGURATION_AGENT_H_
 #define _SCIC_SDS_PORT_CONFIGURATION_AGENT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_port_registers.h
--- a/head/sys/dev/isci/scil/scic_sds_port_registers.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_port_registers.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_port_registers.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_PORT_REGISTERS_H_
 #define _SCIC_SDS_PORT_REGISTERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_device.c
--- a/head/sys/dev/isci/scil/scic_sds_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_device.h
--- a/head/sys/dev/isci/scil/scic_sds_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_REMOTE_DEVICE_H_
 #define _SCIC_SDS_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_node_context.c
--- a/head/sys/dev/isci/scil/scic_sds_remote_node_context.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_node_context.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_node_context.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_node_context.h
--- a/head/sys/dev/isci/scil/scic_sds_remote_node_context.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_node_context.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_node_context.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_REMOTE_NODE_CONTEXT_H_
 #define _SCIC_SDS_REMOTE_NODE_CONTEXT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_node_table.c
--- a/head/sys/dev/isci/scil/scic_sds_remote_node_table.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_node_table.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_node_table.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_remote_node_table.h
--- a/head/sys/dev/isci/scil/scic_sds_remote_node_table.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_remote_node_table.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_remote_node_table.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_REMOTE_NODE_TABLE_H_
 #define _SCIC_SDS_REMOTE_NODE_TABLE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_request.c
--- a/head/sys/dev/isci/scil/scic_sds_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_request.h
--- a/head/sys/dev/isci/scil/scic_sds_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_IO_REQUEST_H_
 #define _SCIC_SDS_IO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_sgpio.c
--- a/head/sys/dev/isci/scil/scic_sds_sgpio.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_sgpio.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_sgpio.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
 * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_smp_remote_device.c
--- a/head/sys/dev/isci/scil/scic_sds_smp_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_smp_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_smp_remote_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_smp_request.c
--- a/head/sys/dev/isci/scil/scic_sds_smp_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_smp_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_smp_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #include <dev/isci/scil/scic_sds_smp_request.h>
 #include <dev/isci/scil/scic_sds_logger.h>
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_smp_request.h
--- a/head/sys/dev/isci/scil/scic_sds_smp_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_smp_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_smp_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_SMP_REQUEST_T_
 #define _SCIC_SDS_SMP_REQUEST_T_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_ssp_request.c
--- a/head/sys/dev/isci/scil/scic_sds_ssp_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_ssp_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_ssp_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_packet_request.c
--- a/head/sys/dev/isci/scil/scic_sds_stp_packet_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_packet_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_packet_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 #if !defined(DISABLE_ATAPI)
 
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_packet_request.h
--- a/head/sys/dev/isci/scil/scic_sds_stp_packet_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_packet_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_packet_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_STP_PACKET_REQUEST_H_
 #define _SCIC_SDS_STP_PACKET_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_pio_request.h
--- a/head/sys/dev/isci/scil/scic_sds_stp_pio_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_pio_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_pio_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_SATA_PIO_REQUEST_H_
 #define _SCIC_SDS_SATA_PIO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_remote_device.c
--- a/head/sys/dev/isci/scil/scic_sds_stp_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_remote_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_request.c
--- a/head/sys/dev/isci/scil/scic_sds_stp_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_request.c 231137 2012-02-07 17:45:11Z jimharris $");
 
 #include <dev/isci/scil/intel_sat.h>
 #include <dev/isci/scil/intel_sata.h>
@@ -1124,9 +1124,6 @@
          if (status == SCI_SUCCESS)
          {
             this_sds_stp_request->type.pio.pio_transfer_bytes -= remaining_bytes_in_current_sgl;
-
-            //update the current sgl, sgl_offset and save for future
-            current_sgl = scic_sds_stp_request_pio_get_next_sgl(this_sds_stp_request);
             sgl_offset = 0;
          }
       }
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_stp_request.h
--- a/head/sys/dev/isci/scil/scic_sds_stp_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_stp_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_stp_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SDS_STP_REQUEST_T_
 #define _SCIC_SDS_STP_REQUEST_T_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c
--- a/head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h
--- a/head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_sgpio.h
--- a/head/sys/dev/isci/scil/scic_sgpio.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_sgpio.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_sgpio.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_SGPIO_H_
 #define _SCIC_SGPIO_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_task_request.h
--- a/head/sys/dev/isci/scil/scic_task_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_task_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_task_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_TASK_REQUEST_H_
 #define _SCIC_TASK_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scic_user_callback.h
--- a/head/sys/dev/isci/scil/scic_user_callback.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scic_user_callback.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scic_user_callback.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIC_USER_CALLBACK_H_
 #define _SCIC_USER_CALLBACK_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_config_parameters.h
--- a/head/sys/dev/isci/scil/scif_config_parameters.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_config_parameters.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_config_parameters.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_USER_PARAMETERS_H_
 #define _SCIF_SAS_USER_PARAMETERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_controller.h
--- a/head/sys/dev/isci/scil/scif_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_CONTROLLER_H_
 #define _SCIF_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_domain.h
--- a/head/sys/dev/isci/scil/scif_domain.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_domain.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_domain.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_DOMAIN_H_
 #define _SCIF_DOMAIN_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_io_request.h
--- a/head/sys/dev/isci/scil/scif_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_IO_REQUEST_H_
 #define _SCIF_IO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_library.h
--- a/head/sys/dev/isci/scil/scif_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_LIBRARY_H_
 #define _SCIF_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_logger.h
--- a/head/sys/dev/isci/scil/scif_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_LOGGER_H_
 #define _SCIF_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_overview.h
--- a/head/sys/dev/isci/scil/scif_overview.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_overview.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_overview.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_OVERVIEW_H_
 #define _SCIF_OVERVIEW_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_remote_device.h
--- a/head/sys/dev/isci/scil/scif_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_REMOTE_DEVICE_H_
 #define _SCIF_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_constants.h
--- a/head/sys/dev/isci/scil/scif_sas_constants.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_constants.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_constants.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_CONSTANTS_H_
 #define _SCIF_SAS_CONSTANTS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_controller.c
--- a/head/sys/dev/isci/scil/scif_sas_controller.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_controller.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_controller.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -87,6 +87,10 @@
    SCIF_SAS_LIBRARY_T    * fw_library    = (SCIF_SAS_LIBRARY_T*) library;
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
+   // Validate the user supplied parameters.
+   if ((library == SCI_INVALID_HANDLE) || (controller == SCI_INVALID_HANDLE))
+      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
+
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(library),
       SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION,
@@ -94,10 +98,6 @@
       library, controller
    ));
 
-   // Validate the user supplied parameters.
-   if ((library == SCI_INVALID_HANDLE) || (controller == SCI_INVALID_HANDLE))
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-
    // Construct the base controller.  As part of constructing the base
    // controller we ask it to also manage the MDL iteration for the Core.
    sci_base_controller_construct(
@@ -144,6 +144,10 @@
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
+   // Validate the user supplied parameters.
+   if (controller == SCI_INVALID_HANDLE)
+      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
+
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
       SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION,
@@ -151,10 +155,6 @@
       controller
    ));
 
-   // Validate the user supplied parameters.
-   if (controller == SCI_INVALID_HANDLE)
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-
    return fw_controller->state_handlers->initialize_handler(
              &fw_controller->parent
           );
@@ -187,6 +187,10 @@
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
+   // Validate the user supplied parameters.
+   if (controller == SCI_INVALID_HANDLE)
+      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
+
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
       SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_INITIALIZATION,
@@ -194,10 +198,6 @@
       controller, timeout
    ));
 
-   // Validate the user supplied parameters.
-   if (controller == SCI_INVALID_HANDLE)
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-
    return fw_controller->state_handlers->
           start_handler(&fw_controller->parent, timeout);
 }
@@ -211,6 +211,10 @@
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
+   // Validate the user supplied parameters.
+   if (controller == SCI_INVALID_HANDLE)
+      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
+
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
       SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_SHUTDOWN,
@@ -218,10 +222,6 @@
       controller, timeout
    ));
 
-   // Validate the user supplied parameters.
-   if (controller == SCI_INVALID_HANDLE)
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-
    return fw_controller->state_handlers->
           stop_handler(&fw_controller->parent, timeout);
 
@@ -235,6 +235,10 @@
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
+   // Validate the user supplied parameters.
+   if (controller == SCI_INVALID_HANDLE)
+      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
+
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
       SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_CONTROLLER_RESET,
@@ -242,10 +246,6 @@
       controller
    ));
 
-   // Validate the user supplied parameters.
-   if (controller == SCI_INVALID_HANDLE)
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-
    return fw_controller->state_handlers->
           reset_handler(&fw_controller->parent);
 }
@@ -271,6 +271,7 @@
 )
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
+   SCI_STATUS              status;
 
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
@@ -284,7 +285,7 @@
       || scif_sas_controller_sufficient_resource(controller)
       )
    {
-      return fw_controller->state_handlers->start_io_handler(
+      status = fw_controller->state_handlers->start_io_handler(
                 (SCI_BASE_CONTROLLER_T*) controller,
                 (SCI_BASE_REMOTE_DEVICE_T*) remote_device,
                 (SCI_BASE_REQUEST_T*) io_request,
@@ -292,7 +293,9 @@
              );
    }
    else
-      return SCI_FAILURE_INSUFFICIENT_RESOURCES;
+      status = SCI_FAILURE_INSUFFICIENT_RESOURCES;
+
+   return (SCI_IO_STATUS)status;
 }
 
 // ---------------------------------------------------------------------------
@@ -305,6 +308,15 @@
 )
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
+   SCI_STATUS              status;
+
+   // Validate the user supplied parameters.
+   if (  (controller == SCI_INVALID_HANDLE)
+      || (remote_device == SCI_INVALID_HANDLE)
+      || (task_request == SCI_INVALID_HANDLE) )
+   {
+      return SCI_TASK_FAILURE_INVALID_PARAMETER_VALUE;
+   }
 
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(controller),
@@ -313,17 +325,9 @@
       controller, remote_device, task_request, io_tag
    ));
 
-   // Validate the user supplied parameters.
-   if (  (controller == SCI_INVALID_HANDLE)
-      || (remote_device == SCI_INVALID_HANDLE)
-      || (task_request == SCI_INVALID_HANDLE) )
-   {
-      return SCI_FAILURE_INVALID_PARAMETER_VALUE;
-   }
-
    if (scif_sas_controller_sufficient_resource(controller))
    {
-      return fw_controller->state_handlers->start_task_handler(
+      status = fw_controller->state_handlers->start_task_handler(
              (SCI_BASE_CONTROLLER_T*) controller,
              (SCI_BASE_REMOTE_DEVICE_T*) remote_device,
              (SCI_BASE_REQUEST_T*) task_request,
@@ -331,7 +335,9 @@
           );
    }
    else
-      return SCI_FAILURE_INSUFFICIENT_RESOURCES;
+      status = SCI_FAILURE_INSUFFICIENT_RESOURCES;
+
+   return (SCI_TASK_STATUS)status;
 }
 
 // ---------------------------------------------------------------------------
@@ -368,13 +374,6 @@
 {
    SCIF_SAS_CONTROLLER_T * fw_controller = (SCIF_SAS_CONTROLLER_T*) controller;
 
-   SCIF_LOG_TRACE((
-      sci_base_object_get_logger(controller),
-      SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT,
-      "scif_controller_complete_task(0x%x, 0x%x, 0x%x) enter\n",
-      controller, remote_device, task_request
-   ));
-
    // Validate the user supplied parameters.
    if (  (controller == SCI_INVALID_HANDLE)
       || (remote_device == SCI_INVALID_HANDLE)
@@ -383,6 +382,13 @@
       return SCI_FAILURE_INVALID_PARAMETER_VALUE;
    }
 
+   SCIF_LOG_TRACE((
+      sci_base_object_get_logger(controller),
+      SCIF_LOG_OBJECT_CONTROLLER | SCIF_LOG_OBJECT_TASK_MANAGEMENT,
+      "scif_controller_complete_task(0x%x, 0x%x, 0x%x) enter\n",
+      controller, remote_device, task_request
+   ));
+
    return fw_controller->state_handlers->complete_task_handler(
              (SCI_BASE_CONTROLLER_T*) controller,
              (SCI_BASE_REMOTE_DEVICE_T*) remote_device,
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_controller.h
--- a/head/sys/dev/isci/scil/scif_sas_controller.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_controller.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_controller.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_CONTROLLER_H_
 #define _SCIF_SAS_CONTROLLER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -586,7 +586,7 @@
    if (status == SCI_SUCCESS)
    {
       // Ask the core to start processing for this IO request.
-      status = scic_controller_start_io(
+      status = (SCI_STATUS)scic_controller_start_io(
                   fw_controller->core_object,
                   fw_device->core_object,
                   fw_io->parent.core_object,
@@ -903,7 +903,7 @@
       }
 
       // Ask the core to start processing for this task request.
-      status = scic_controller_start_task(
+      status = (SCI_STATUS)scic_controller_start_task(
                   fw_controller->core_object,
                   fw_device->core_object,
                   fw_task->parent.core_object,
@@ -1072,7 +1072,7 @@
    if (status == SCI_SUCCESS)
    {
       // Ask the core to start processing for this IO request.
-      status = scic_controller_start_io(
+      status = (SCI_STATUS)scic_controller_start_io(
                   fw_controller->core_object,
                   fw_device->core_object,
                   fw_io->parent.core_object,
@@ -1683,7 +1683,7 @@
          &((SCIF_SAS_CONTROLLER_T *)controller)->parent.state_machine)
    ));
 
-   return SCI_IO_FAILURE;
+   return SCI_FAILURE;
 }
 
 #define scif_sas_controller_stopping_complete_io_handler   \
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_controller_states.c
--- a/head/sys/dev/isci/scil/scif_sas_controller_states.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_controller_states.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_controller_states.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_design.h
--- a/head/sys/dev/isci/scil/scif_sas_design.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_design.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_design.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_DESIGN_H_
 #define _SCIF_SAS_DESIGN_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_domain.c
--- a/head/sys/dev/isci/scil/scif_sas_domain.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_domain.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_domain.c 231137 2012-02-07 17:45:11Z jimharris $");
 
 /**
  * @file
@@ -142,8 +142,8 @@
 {
    SCIF_SAS_DOMAIN_T * fw_domain = (SCIF_SAS_DOMAIN_T*) domain;
 
-   if ( (fw_domain != NULL) && (fw_domain->core_object != SCI_INVALID_HANDLE) )
-      return fw_domain->core_object;
+   if ( (fw_domain == NULL) || (fw_domain->core_object == SCI_INVALID_HANDLE) )
+      return SCI_INVALID_HANDLE;
 
    SCIF_LOG_WARNING((
       sci_base_object_get_logger(fw_domain),
@@ -152,7 +152,7 @@
       fw_domain
    ));
 
-   return SCI_INVALID_HANDLE;
+   return fw_domain->core_object;
 }
 
 // ---------------------------------------------------------------------------
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_domain.h
--- a/head/sys/dev/isci/scil/scif_sas_domain.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_domain.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_domain.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_DOMAIN_H_
 #define _SCIF_SAS_DOMAIN_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_domain_states.c
--- a/head/sys/dev/isci/scil/scif_sas_domain_states.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_domain_states.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_domain_states.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c
--- a/head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h
--- a/head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_HIGH_PRIORITY_REQUEST_QUEUE_H_
 #define _SCIF_SAS_HIGH_PRIORITY_REQUEST_QUEUE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_internal_io_request.c
--- a/head/sys/dev/isci/scil/scif_sas_internal_io_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_internal_io_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_internal_io_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_internal_io_request.h
--- a/head/sys/dev/isci/scil/scif_sas_internal_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_internal_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_internal_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_INTERNAL_REQUEST_H_
 #define _SCIF_SAS_INTERNAL_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_io_request.c
--- a/head/sys/dev/isci/scil/scif_sas_io_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_io_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_io_request.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -811,7 +811,7 @@
    );
 
    //start the new constructed IO.
-   return scif_controller_start_io(
+   return (SCI_STATUS)scif_controller_start_io(
              (SCI_CONTROLLER_HANDLE_T) fw_controller,
              (SCI_REMOTE_DEVICE_HANDLE_T) fw_device,
              (SCI_IO_REQUEST_HANDLE_T) fw_request,
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_io_request.h
--- a/head/sys/dev/isci/scil/scif_sas_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_IO_REQUEST_H_
 #define _SCIF_SAS_IO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_io_request_states.c
--- a/head/sys/dev/isci/scil/scif_sas_io_request_states.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_io_request_states.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_io_request_states.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_library.c
--- a/head/sys/dev/isci/scil/scif_sas_library.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_library.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_library.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_library.h
--- a/head/sys/dev/isci/scil/scif_sas_library.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_library.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_library.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_LIBRARY_H_
 #define _SCIF_SAS_LIBRARY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_logger.h
--- a/head/sys/dev/isci/scil/scif_sas_logger.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_logger.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_logger.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_LOGGER_H_
 #define _SCIF_SAS_LOGGER_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device.c 231137 2012-02-07 17:45:11Z jimharris $");
 
 /**
  * @file
@@ -362,8 +362,8 @@
    SCIF_SAS_REMOTE_DEVICE_T * fw_device = (SCIF_SAS_REMOTE_DEVICE_T*)
                                           scif_remote_device;
 
-   if ( (fw_device != NULL) && (fw_device->core_object != SCI_INVALID_HANDLE) )
-      return fw_device->core_object;
+   if ( (fw_device == NULL) || (fw_device->core_object == SCI_INVALID_HANDLE) )
+      return SCI_INVALID_HANDLE;
 
    SCIF_LOG_WARNING((
       sci_base_object_get_logger(fw_device),
@@ -372,7 +372,7 @@
       fw_device
    ));
 
-   return SCI_INVALID_HANDLE;
+   return fw_device->core_object;
 }
 
 // ---------------------------------------------------------------------------
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device.h
--- a/head/sys/dev/isci/scil/scif_sas_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_REMOTE_DEVICE_H_
 #define _SCIF_SAS_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -255,7 +255,7 @@
       }
    }
 
-   status = scif_controller_start_task(
+   scif_controller_start_task(
       fw_controller,
       fw_device,
       fw_request,
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_remote_device_states.c
--- a/head/sys/dev/isci/scil/scif_sas_remote_device_states.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_remote_device_states.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_remote_device_states.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_request.c
--- a/head/sys/dev/isci/scil/scif_sas_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_request.h
--- a/head/sys/dev/isci/scil/scif_sas_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_REQUEST_H_
 #define _SCIF_SAS_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_sati_binding.h
--- a/head/sys/dev/isci/scil/scif_sas_sati_binding.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_sati_binding.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_sati_binding.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_SATI_BINDING_H_
 #define _SCIF_SAS_SATI_BINDING_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
--- a/head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_io_request.c
--- a/head/sys/dev/isci/scil/scif_sas_smp_io_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_io_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_io_request.c 231137 2012-02-07 17:45:11Z jimharris $");
 
 /**
  * @file
@@ -580,7 +580,7 @@
 
       default:
          //unsupported case, TBD
-         break;
+         return SCI_FAILURE;
    } //end of switch
 
    //set the retry count to new built smp request.
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_io_request.h
--- a/head/sys/dev/isci/scil/scif_sas_smp_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_SMP_REQUEST_H_
 #define _SCIF_SAS_SMP_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_phy.c
--- a/head/sys/dev/isci/scil/scif_sas_smp_phy.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_phy.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_phy.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_phy.h
--- a/head/sys/dev/isci/scil/scif_sas_smp_phy.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_phy.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_phy.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_SMP_PHY_H_
 #define _SCIF_SAS_SMP_PHY_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_remote_device.c
--- a/head/sys/dev/isci/scil/scif_sas_smp_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_remote_device.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -748,7 +748,6 @@
 {
    SCIF_SAS_DOMAIN_T  * fw_domain;
    SCI_SAS_ADDRESS_T attached_device_address;
-   SCIF_SAS_REMOTE_DEVICE_T * attached_remote_device;
    SMP_RESPONSE_DISCOVER_T * discover_response =
       &smp_response->response.discover;
 
@@ -782,13 +781,11 @@
       fw_domain = fw_device->domain;
       attached_device_address = discover_response->attached_sas_address;
 
-      attached_remote_device = (SCIF_SAS_REMOTE_DEVICE_T *)
-         scif_domain_get_device_by_sas_address(
-         fw_domain, &attached_device_address
-      );
-
       // the device should have already existed in the domian.
-      ASSERT (attached_remote_device != SCI_INVALID_HANDLE);
+      ASSERT(scif_domain_get_device_by_sas_address(
+                fw_domain,
+                &attached_device_address
+             ) != SCI_INVALID_HANDLE);
       return SCI_SUCCESS;
    }
    else
@@ -1774,6 +1771,8 @@
    SCI_FAST_LIST_ELEMENT_T  * element = smp_remote_device->smp_phy_list.list_head;
    SCIF_SAS_SMP_PHY_T * curr_smp_phy = NULL;
 
+   ASSERT(phy_identifier < smp_remote_device->smp_phy_list.number_of_phys);
+
    while (element != NULL)
    {
       curr_smp_phy = (SCIF_SAS_SMP_PHY_T*) sci_fast_list_get_object(element);
@@ -1854,7 +1853,7 @@
    ));
 
    scif_sas_smp_remote_device_decode_smp_response(
-      fw_device, fw_request, NULL, SCI_FAILURE_RETRY_REQUIRED
+      fw_device, fw_request, NULL, SCI_IO_FAILURE_RETRY_REQUIRED
    );
 }
 
@@ -1934,11 +1933,8 @@
       scif_domain_get_device_by_sas_address(
          fw_device->domain, &discover_response->attached_sas_address);
 
-   if (smp_phy != NULL)
-   {
-      scif_sas_smp_phy_save_information(
-         smp_phy, attached_device, discover_response);
-   }
+   scif_sas_smp_phy_save_information(
+      smp_phy, attached_device, discover_response);
 
    //handle the special case of smp phys between expanders.
    if ( discover_response->protocols.u.bits.attached_smp_target )
@@ -2372,11 +2368,7 @@
    SCIF_SAS_REMOTE_DEVICE_T * fw_device
 )
 {
-   SCIF_SAS_SMP_PHY_T * smp_phy_being_config =
-      scif_sas_smp_remote_device_find_smp_phy_by_id(
-         fw_device->protocol_device.smp_device.current_activity_phy_index,
-         &(fw_device->protocol_device.smp_device)
-      );
+   SCIF_SAS_SMP_PHY_T * smp_phy_being_config;
 
    SCIF_LOG_TRACE((
       sci_base_object_get_logger(fw_device),
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_smp_remote_device.h
--- a/head/sys/dev/isci/scil/scif_sas_smp_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_smp_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_smp_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_SMP_REMOTE_DEVICE_H_
 #define _SCIF_SAS_SMP_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_io_request.c
--- a/head/sys/dev/isci/scil/scif_sas_stp_io_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_io_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_io_request.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 /**
  * @file
@@ -396,7 +396,7 @@
       fw_io->parent.protocol_complete_handler
          = scif_sas_stp_core_cb_io_request_complete_handler;
       // Done with translation
-      sci_status = SATI_SUCCESS;
+      sci_status = SCI_SUCCESS;
    }
    else if (sati_status == SATI_COMPLETE)
       sci_status = SCI_SUCCESS_IO_COMPLETE_BEFORE_START;
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_io_request.h
--- a/head/sys/dev/isci/scil/scif_sas_stp_io_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_io_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_io_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_STP_IO_REQUEST_H_
 #define _SCIF_SAS_STP_IO_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_remote_device.c
--- a/head/sys/dev/isci/scil/scif_sas_stp_remote_device.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_remote_device.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_remote_device.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_remote_device.h
--- a/head/sys/dev/isci/scil/scif_sas_stp_remote_device.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_remote_device.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_remote_device.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_STP_REMOTE_DEVICE_H_
 #define _SCIF_SAS_STP_REMOTE_DEVICE_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_task_request.c
--- a/head/sys/dev/isci/scil/scif_sas_stp_task_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_task_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_task_request.c 231296 2012-02-09 17:50:24Z jimharris $");
 
 #include <dev/isci/scil/sati.h>
 #include <dev/isci/scil/scif_sas_logger.h>
@@ -254,7 +254,7 @@
                fw_domain->controller,
                fw_device,
                pending_request,
-               SCI_FAILURE_IO_TERMINATED
+               SCI_IO_FAILURE_TERMINATED
             );
          }
          //otherwise, the abort succeeded. Since the waiting flag is cleared,
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_stp_task_request.h
--- a/head/sys/dev/isci/scil/scif_sas_stp_task_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_stp_task_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_stp_task_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_STP_TASK_REQUEST_H_
 #define _SCIF_SAS_STP_TASK_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_task_request.c
--- a/head/sys/dev/isci/scil/scif_sas_task_request.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_task_request.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_task_request.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_task_request.h
--- a/head/sys/dev/isci/scil/scif_sas_task_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_task_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_sas_task_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_SAS_TASK_REQUEST_H_
 #define _SCIF_SAS_TASK_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c
--- a/head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_task_request_states.c
--- a/head/sys/dev/isci/scil/scif_sas_task_request_states.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_task_request_states.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_task_request_states.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_sas_timer.c
--- a/head/sys/dev/isci/scil/scif_sas_timer.c	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_sas_timer.c	Fri Mar 02 17:10:07 2012 +0200
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/dev/isci/scil/scif_sas_timer.c 231136 2012-02-07 17:43:58Z jimharris $");
 
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_task_request.h
--- a/head/sys/dev/isci/scil/scif_task_request.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_task_request.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_task_request.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_TASK_REQUEST_H_
 #define _SCIF_TASK_REQUEST_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scif_user_callback.h
--- a/head/sys/dev/isci/scil/scif_user_callback.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scif_user_callback.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scif_user_callback.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCIF_USER_CALLBACK_H_
 #define _SCIF_USER_CALLBACK_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_bios_definitions.h
--- a/head/sys/dev/isci/scil/scu_bios_definitions.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_bios_definitions.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_bios_definitions.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_BIOS_DEFINITIONS_H_
 #define _SCU_BIOS_DEFINITIONS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_completion_codes.h
--- a/head/sys/dev/isci/scil/scu_completion_codes.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_completion_codes.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_completion_codes.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_COMPLETION_CODES_HEADER_
 #define _SCU_COMPLETION_CODES_HEADER_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_constants.h
--- a/head/sys/dev/isci/scil/scu_constants.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_constants.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_constants.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_CONSTANTS_H_
 #define _SCU_CONSTANTS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_event_codes.h
--- a/head/sys/dev/isci/scil/scu_event_codes.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_event_codes.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_event_codes.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef __SCU_EVENT_CODES_HEADER__
 #define __SCU_EVENT_CODES_HEADER__
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_registers.h
--- a/head/sys/dev/isci/scil/scu_registers.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_registers.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_registers.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_REGISTERS_H_
 #define _SCU_REGISTERS_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_remote_node_context.h
--- a/head/sys/dev/isci/scil/scu_remote_node_context.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_remote_node_context.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_remote_node_context.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef __SCU_REMOTE_NODE_CONTEXT_HEADER__
 #define __SCU_REMOTE_NODE_CONTEXT_HEADER__
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_task_context.h
--- a/head/sys/dev/isci/scil/scu_task_context.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_task_context.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_task_context.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_TASK_CONTEXT_H_
 #define _SCU_TASK_CONTEXT_H_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_unsolicited_frame.h
--- a/head/sys/dev/isci/scil/scu_unsolicited_frame.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_unsolicited_frame.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_unsolicited_frame.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 /**
  * @file
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/scil/scu_viit_data.h
--- a/head/sys/dev/isci/scil/scu_viit_data.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/scil/scu_viit_data.h	Fri Mar 02 17:10:07 2012 +0200
@@ -49,7 +49,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/scil/scu_viit_data.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _SCU_VIIT_DATA_HEADER_
 #define _SCU_VIIT_DATA_HEADER_
diff -r 8ce173496e68 -r 1e39889b0785 head/sys/dev/isci/types.h
--- a/head/sys/dev/isci/types.h	Fri Mar 02 17:09:49 2012 +0200
+++ b/head/sys/dev/isci/types.h	Fri Mar 02 17:10:07 2012 +0200
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/dev/isci/types.h 231136 2012-02-07 17:43:58Z jimharris $
  */
 #ifndef _DRIVER_INCLUDE_TYPES_H_
 #define _DRIVER_INCLUDE_TYPES_H_


More information about the Zrouter-src-freebsd mailing list