Add 8Gb card firmware. Update some 2Gb and 4Gb f/w sets.
Split 4Gb and 8Gb into pieces that can be either multi_id capable or not. Reviewed by: scottl, ken Approved by: re
This commit is contained in:
Matt Jacob
parent
faf666aa77
commit
b965588786
12721
sys/dev/ispfw/asm_2300.h
12721
sys/dev/ispfw/asm_2300.h
File diff suppressed because it is too large
Load Diff
40273
sys/dev/ispfw/asm_2400.h
40273
sys/dev/ispfw/asm_2400.h
File diff suppressed because it is too large
Load Diff
27016
sys/dev/ispfw/asm_2500.h
Normal file
27016
sys/dev/ispfw/asm_2500.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
|
||||
#define ISP_2300 1
|
||||
#define ISP_2322 1
|
||||
#define ISP_2400 1
|
||||
#define ISP_2400_MULTI 1
|
||||
#define ISP_2500 1
|
||||
#define ISP_2500_MULTI 1
|
||||
#endif
|
||||
|
||||
#ifndef MODULE_NAME
|
||||
@ -85,9 +88,12 @@ __FBSDID("$FreeBSD$");
|
||||
#if defined(ISP_2322)
|
||||
#include <dev/ispfw/asm_2322.h>
|
||||
#endif
|
||||
#if defined(ISP_2400)
|
||||
#if defined(ISP_2400) || defined(ISP_2400_MULTI)
|
||||
#include <dev/ispfw/asm_2400.h>
|
||||
#endif
|
||||
#if defined(ISP_2500) || defined(ISP_2500_MULTI)
|
||||
#include <dev/ispfw/asm_2500.h>
|
||||
#endif
|
||||
|
||||
#if defined(ISP_1000)
|
||||
static int isp_1000_loaded;
|
||||
@ -125,6 +131,15 @@ static int isp_2322_loaded;
|
||||
#if defined(ISP_2400)
|
||||
static int isp_2400_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
static int isp_2400_multi_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
static int isp_2500_loaded;
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
static int isp_2500_multi_loaded;
|
||||
#endif
|
||||
|
||||
#define ISPFW_VERSION 1
|
||||
#define RMACRO(token) do { \
|
||||
@ -193,6 +208,15 @@ do_load_fw(void)
|
||||
#if defined(ISP_2400)
|
||||
RMACRO(isp_2400);
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
RMACRO(isp_2400_multi);
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
RMACRO(isp_2500);
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
RMACRO(isp_2500_multi);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@ -235,6 +259,15 @@ do_unload_fw(void)
|
||||
#if defined(ISP_2400)
|
||||
UMACRO(isp_2400);
|
||||
#endif
|
||||
#if defined(ISP_2400_MULTI)
|
||||
UMACRO(isp_2400_multi);
|
||||
#endif
|
||||
#if defined(ISP_2500)
|
||||
UMACRO(isp_2500);
|
||||
#endif
|
||||
#if defined(ISP_2500_MULTI)
|
||||
UMACRO(isp_2500_multi);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int
|
||||
@ -284,6 +317,12 @@ DECLARE_MODULE(isp_2300, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
DECLARE_MODULE(isp_2322, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2400)
|
||||
DECLARE_MODULE(isp_2400, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2400_MULTI)
|
||||
DECLARE_MODULE(isp_2400_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2500)
|
||||
DECLARE_MODULE(isp_2500, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#elif defined(ISP_2500_MULTI)
|
||||
DECLARE_MODULE(isp_2500_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD);
|
||||
#else
|
||||
#error "firmware not specified"
|
||||
#endif
|
||||
|
||||
@ -39,6 +39,9 @@ SUBDIR += isp_2200
|
||||
SUBDIR += isp_2300
|
||||
SUBDIR += isp_2322
|
||||
SUBDIR += isp_2400
|
||||
SUBDIR += isp_2400_multi
|
||||
SUBDIR += isp_2500
|
||||
SUBDIR += isp_2500_multi
|
||||
.if ${MACHINE} == "sparc64"
|
||||
SUBDIR += isp_1000
|
||||
.endif
|
||||
|
||||
35
sys/modules/ispfw/isp_2400_multi/Makefile
Normal file
35
sys/modules/ispfw/isp_2400_multi/Makefile
Normal file
@ -0,0 +1,35 @@
|
||||
# $FreeBSD$
|
||||
#-
|
||||
# Copyright (c) 2009 by Matthew Jacob
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice immediately at the beginning of the file, without modification,
|
||||
# this list of conditions, and the following disclaimer.
|
||||
# 2. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/ispfw
|
||||
|
||||
KMOD= isp_2400_multi
|
||||
SRCS= ispfw.c
|
||||
|
||||
CFLAGS += -DISP_2400_MULTI -DMODULE_NAME=\"${KMOD}\"
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
36
sys/modules/ispfw/isp_2500/Makefile
Normal file
36
sys/modules/ispfw/isp_2500/Makefile
Normal file
@ -0,0 +1,36 @@
|
||||
# $FreeBSD$
|
||||
#-
|
||||
# Copyright (c) 2009 by Matthew Jacob
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice immediately at the beginning of the file, without modification,
|
||||
# this list of conditions, and the following disclaimer.
|
||||
# 2. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/ispfw
|
||||
|
||||
KMOD= isp_2500
|
||||
SRCS= ispfw.c
|
||||
|
||||
CFLAGS += -DISP_2500 -DMODULE_NAME=\"${KMOD}\"
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
35
sys/modules/ispfw/isp_2500_multi/Makefile
Normal file
35
sys/modules/ispfw/isp_2500_multi/Makefile
Normal file
@ -0,0 +1,35 @@
|
||||
# $FreeBSD$
|
||||
#-
|
||||
# Copyright (c) 2009 by Matthew Jacob
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice immediately at the beginning of the file, without modification,
|
||||
# this list of conditions, and the following disclaimer.
|
||||
# 2. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/ispfw
|
||||
|
||||
KMOD= isp_2500_multi
|
||||
SRCS= ispfw.c
|
||||
|
||||
CFLAGS += -DISP_2500_MULTI -DMODULE_NAME=\"${KMOD}\"
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
Loading…
Reference in New Issue
Block a user