From e26c36e0036265c1a2495a07ad7b56f7bcf91802 Mon Sep 17 00:00:00 2001 From: scottl Date: Wed, 9 May 2007 04:16:32 +0000 Subject: Import version 3.60.03.006 of the TWA driver: This patch does the following: - Remove un-necessary code that is not even compiling into the driver under TW_OSL_NON_DMA_MEM_ALLOC_PER_REQUEST defines. - Remove bundled firmware image and associated "files" entry for tw_cl_fwimg.c - Remove bundled firmware flashing routines. We now have tw_update userspace FreeBSD controller flash utility. - Fix driver crash on load due to shared interrupt. - Fix 2 lock leaks for Giant lock. - Fix CCB leak. - Add support for 9650SE controllers. Many thanks to 3Ware/AMCC for continuing to support FreeBSD. --- sys/dev/twa/tw_cl_externs.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'sys/dev/twa/tw_cl_externs.h') diff --git a/sys/dev/twa/tw_cl_externs.h b/sys/dev/twa/tw_cl_externs.h index 1fb51ac..1dd2425 100644 --- a/sys/dev/twa/tw_cl_externs.h +++ b/sys/dev/twa/tw_cl_externs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-05 Applied Micro Circuits Corporation. + * Copyright (c) 2004-07 Applied Micro Circuits Corporation. * Copyright (c) 2004-05 Vinod Kashyap * All rights reserved. * @@ -31,6 +31,7 @@ * AMCC'S 3ware driver for 9000 series storage controllers. * * Author: Vinod Kashyap + * Modifications by: Adam Radford */ @@ -50,18 +51,6 @@ extern TW_INT32 tw_cli_fw_img_size; extern TW_INT8 *tw_cli_severity_string_table[]; -#ifdef TW_OSL_FLASH_FIRMWARE - -/* Functions in tw_cl_init.c */ - -/* Flash bundled firmware image onto controller. */ -extern TW_INT32 tw_cli_flash_firmware(struct tw_cli_ctlr_context *ctlr); - -/* Hard reset the controller. */ -extern TW_INT32 tw_cli_hard_reset(struct tw_cli_ctlr_context *ctlr); - -#endif /* TW_OSL_FLASH_FIRMWARE */ - /* Do controller initialization. */ extern TW_INT32 tw_cli_start_ctlr(struct tw_cli_ctlr_context *ctlr); @@ -197,9 +186,6 @@ extern TW_INT32 tw_cli_poll_status(struct tw_cli_ctlr_context *ctlr, /* Get a free CL internal request context packet. */ extern struct tw_cli_req_context * tw_cli_get_request(struct tw_cli_ctlr_context *ctlr -#ifdef TW_OSL_NON_DMA_MEM_ALLOC_PER_REQUEST - , struct tw_cl_req_packet *req_pkt -#endif /* TW_OSL_NON_DMA_MEM_ALLOC_PER_REQUEST */ ); /* Notify OSL of controller info (fw/BIOS versions, etc.). */ -- cgit v1.1