mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-28 08:02:54 +00:00
Code Issues Releases Activity

ahc(4) clean up old Linux defines

Browse Source 
Linux removed theirs starting in 2018 in commit:
"scsi: aic7xxx: Fix build using bare-metal toolchain"

Also remove now-useless sys/cdefs.h includes

Signed-off-by: HP van Braam <hp@tmm.cx>
Reviewed by: imp, mav, emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/1189
This commit is contained in:
HP van Braam 2024-04-23 14:55:36 -06:00 committed by Warner Losh
parent ea6f2d7797
commit 65971073d9
15 changed files with 2 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/aic7xxx/ahc_isa.c
View File

@ -37,7 +37,6 @@
* $Id$ * $Id$
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <sys/limits.h> /* For CHAR_BIT*/ #include <sys/limits.h> /* For CHAR_BIT*/

1
sys/dev/aic7xxx/ahc_pci.c
View File

@ -31,7 +31,6 @@
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#19 $ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#19 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
static int ahc_pci_probe(device_t dev); static int ahc_pci_probe(device_t dev);

1
sys/dev/aic7xxx/ahd_pci.c
View File

@ -31,7 +31,6 @@
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#17 $ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#17 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_osm.h>
static int ahd_pci_probe(device_t dev); static int ahd_pci_probe(device_t dev);

7
sys/dev/aic7xxx/aic7770.c
View File

@ -42,16 +42,9 @@
* $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $
*/ */
#ifdef __linux__
#include "aic7xxx_osm.h"
#include "aic7xxx_inline.h"
#include "aic7xxx_93cx6.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aic7xxx_inline.h>
#include <dev/aic7xxx/aic7xxx_93cx6.h> #include <dev/aic7xxx/aic7xxx_93cx6.h>
#endif
#define ID_AIC7770 0x04907770 #define ID_AIC7770 0x04907770
#define ID_AHA_274x 0x04907771 #define ID_AHA_274x 0x04907771

35
sys/dev/aic7xxx/aic79xx.c
View File

@ -42,16 +42,9 @@
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#246 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#246 $
*/ */
#ifdef __linux__
#include "aic79xx_osm.h"
#include "aic79xx_inline.h"
#include "aicasm/aicasm_insformat.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_osm.h>
#include <dev/aic7xxx/aic79xx_inline.h> #include <dev/aic7xxx/aic79xx_inline.h>
#include <dev/aic7xxx/aicasm/aicasm_insformat.h> #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
#endif
/******************************** Globals *************************************/ /******************************** Globals *************************************/
struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq); struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq);
@ -2250,7 +2243,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
printerror = 0; printerror = 0;
} else if (ahd_sent_msg(ahd, AHDMSG_1B, } else if (ahd_sent_msg(ahd, AHDMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) { MSG_BUS_DEV_RESET, TRUE)) {
#ifdef __FreeBSD__
/* /*
* Don't mark the user's request for this BDR * Don't mark the user's request for this BDR
* as completing with CAM_BDR_SENT. CAM3 * as completing with CAM_BDR_SENT. CAM3
@ -2262,7 +2254,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
CAM_LUN_WILDCARD, SCB_LIST_NULL, CAM_LUN_WILDCARD, SCB_LIST_NULL,
ROLE_INITIATOR)) ROLE_INITIATOR))
aic_set_transaction_status(scb, CAM_REQ_CMP); aic_set_transaction_status(scb, CAM_REQ_CMP);
#endif
ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD, ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD,
CAM_BDR_SENT, "Bus Device Reset", CAM_BDR_SENT, "Bus Device Reset",
/*verbose_level*/0); /*verbose_level*/0);
@ -5223,23 +5214,11 @@ ahd_alloc(void *platform_arg, char *name)
{ {
struct ahd_softc *ahd; struct ahd_softc *ahd;
#ifndef __FreeBSD__
ahd = malloc(sizeof(*ahd), M_DEVBUF, M_NOWAIT);
if (!ahd) {
printf("aic7xxx: cannot malloc softc!\n");
free(name, M_DEVBUF);
return NULL;
}
#else
ahd = device_get_softc((device_t)platform_arg); ahd = device_get_softc((device_t)platform_arg);
#endif
memset(ahd, 0, sizeof(*ahd)); memset(ahd, 0, sizeof(*ahd));
ahd->seep_config = malloc(sizeof(*ahd->seep_config), ahd->seep_config = malloc(sizeof(*ahd->seep_config),
M_DEVBUF, M_NOWAIT); M_DEVBUF, M_NOWAIT);
if (ahd->seep_config == NULL) { if (ahd->seep_config == NULL) {
#ifndef __FreeBSD__
free(ahd, M_DEVBUF);
#endif
free(name, M_DEVBUF); free(name, M_DEVBUF);
return (NULL); return (NULL);
} }
@ -5377,17 +5356,13 @@ ahd_free(struct ahd_softc *ahd)
case 2: case 2:
aic_dma_tag_destroy(ahd, ahd->shared_data_dmat); aic_dma_tag_destroy(ahd, ahd->shared_data_dmat);
case 1: case 1:
#ifndef __linux__
aic_dma_tag_destroy(ahd, ahd->buffer_dmat); aic_dma_tag_destroy(ahd, ahd->buffer_dmat);
#endif
break; break;
case 0: case 0:
break; break;
} }
#ifndef __linux__
aic_dma_tag_destroy(ahd, ahd->parent_dmat); aic_dma_tag_destroy(ahd, ahd->parent_dmat);
#endif
ahd_platform_free(ahd); ahd_platform_free(ahd);
ahd_fini_scbdata(ahd); ahd_fini_scbdata(ahd);
for (i = 0; i < AHD_NUM_TARGETS; i++) { for (i = 0; i < AHD_NUM_TARGETS; i++) {
@ -5423,9 +5398,6 @@ ahd_free(struct ahd_softc *ahd)
free(ahd->seep_config, M_DEVBUF); free(ahd->seep_config, M_DEVBUF);
if (ahd->saved_stack != NULL) if (ahd->saved_stack != NULL)
free(ahd->saved_stack, M_DEVBUF); free(ahd->saved_stack, M_DEVBUF);
#ifndef __FreeBSD__
free(ahd, M_DEVBUF);
#endif
return; return;
} }
@ -6146,9 +6118,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
for (i = 0; i < newcount; i++) { for (i = 0; i < newcount; i++) {
struct scb_platform_data *pdata; struct scb_platform_data *pdata;
u_int col_tag; u_int col_tag;
#ifndef __linux__
int error; int error;
#endif
next_scb = (struct scb *)malloc(sizeof(*next_scb), next_scb = (struct scb *)malloc(sizeof(*next_scb),
M_DEVBUF, M_NOWAIT); M_DEVBUF, M_NOWAIT);
@ -6184,7 +6154,6 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
next_scb->sg_list_busaddr += sizeof(struct ahd_dma_seg); next_scb->sg_list_busaddr += sizeof(struct ahd_dma_seg);
next_scb->ahd_softc = ahd; next_scb->ahd_softc = ahd;
next_scb->flags = SCB_FLAG_NONE; next_scb->flags = SCB_FLAG_NONE;
#ifndef __linux__
error = aic_dmamap_create(ahd, ahd->buffer_dmat, /*flags*/0, error = aic_dmamap_create(ahd, ahd->buffer_dmat, /*flags*/0,
&next_scb->dmamap); &next_scb->dmamap);
if (error != 0) { if (error != 0) {
@ -6192,7 +6161,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
free(pdata, M_DEVBUF); free(pdata, M_DEVBUF);
break; break;
} }
#endif
next_scb->hscb->tag = aic_htole16(scb_data->numscbs); next_scb->hscb->tag = aic_htole16(scb_data->numscbs);
col_tag = scb_data->numscbs ^ 0x100; col_tag = scb_data->numscbs ^ 0x100;
next_scb->col_scb = ahd_find_scb_by_tag(ahd, col_tag); next_scb->col_scb = ahd_find_scb_by_tag(ahd, col_tag);
@ -6295,7 +6264,6 @@ ahd_init(struct ahd_softc *ahd)
if ((AHD_TMODE_ENABLE & (0x1 << ahd->unit)) == 0) if ((AHD_TMODE_ENABLE & (0x1 << ahd->unit)) == 0)
ahd->features &= ~AHD_TARGETMODE; ahd->features &= ~AHD_TARGETMODE;
#ifndef __linux__
/* DMA tag for mapping buffers into device visible space. */ /* DMA tag for mapping buffers into device visible space. */
if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1, if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
/*boundary*/BUS_SPACE_MAXADDR_32BIT + 1, /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
@ -6311,7 +6279,6 @@ ahd_init(struct ahd_softc *ahd)
&ahd->buffer_dmat) != 0) { &ahd->buffer_dmat) != 0) {
return (ENOMEM); return (ENOMEM);
} }
#endif
ahd->init_level++; ahd->init_level++;

4
sys/dev/aic7xxx/aic79xx.h
View File

@ -625,9 +625,7 @@ struct scb {
aic_io_ctx_t io_ctx; aic_io_ctx_t io_ctx;
struct ahd_softc *ahd_softc; struct ahd_softc *ahd_softc;
scb_flag flags; scb_flag flags;
#ifndef __linux__
bus_dmamap_t dmamap; bus_dmamap_t dmamap;
#endif
struct scb_platform_data *platform_data; struct scb_platform_data *platform_data;
struct map_node *hscb_map; struct map_node *hscb_map;
struct map_node *sg_map; struct map_node *sg_map;
@ -1098,9 +1096,7 @@ struct ahd_completion
struct ahd_softc { struct ahd_softc {
bus_space_tag_t tags[2]; bus_space_tag_t tags[2];
bus_space_handle_t bshs[2]; bus_space_handle_t bshs[2];
#ifndef __linux__
bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */
#endif
struct scb_data scb_data; struct scb_data scb_data;
struct hardware_scb *next_queued_hscb; struct hardware_scb *next_queued_hscb;

1
sys/dev/aic7xxx/aic79xx_osm.c
View File

@ -32,7 +32,6 @@
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#35 $ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#35 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_osm.h>
#include <dev/aic7xxx/aic79xx_inline.h> #include <dev/aic7xxx/aic79xx_inline.h>

6
sys/dev/aic7xxx/aic79xx_pci.c
View File

@ -43,14 +43,8 @@
* $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#88 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#88 $
*/ */
#ifdef __linux__
#include "aic79xx_osm.h"
#include "aic79xx_inline.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_osm.h>
#include <dev/aic7xxx/aic79xx_inline.h> #include <dev/aic7xxx/aic79xx_inline.h>
#endif
static __inline uint64_t static __inline uint64_t
ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)

1
sys/dev/aic7xxx/aic79xx_reg_print.c
View File

@ -6,7 +6,6 @@
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic79xx_osm.h> #include <dev/aic7xxx/aic79xx_osm.h>
static ahd_reg_parse_entry_t MODE_PTR_parse_table[] = { static ahd_reg_parse_entry_t MODE_PTR_parse_table[] = {

35
sys/dev/aic7xxx/aic7xxx.c
View File

@ -42,16 +42,9 @@
* $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $
*/ */
#ifdef __linux__
#include "aic7xxx_osm.h"
#include "aic7xxx_inline.h"
#include "aicasm/aicasm_insformat.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aic7xxx_inline.h>
#include <dev/aic7xxx/aicasm/aicasm_insformat.h> #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
#endif
/****************************** Softc Data ************************************/ /****************************** Softc Data ************************************/
struct ahc_softc_tailq ahc_tailq = TAILQ_HEAD_INITIALIZER(ahc_tailq); struct ahc_softc_tailq ahc_tailq = TAILQ_HEAD_INITIALIZER(ahc_tailq);
@ -1277,7 +1270,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
printerror = 0; printerror = 0;
} else if (ahc_sent_msg(ahc, AHCMSG_1B, } else if (ahc_sent_msg(ahc, AHCMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) { MSG_BUS_DEV_RESET, TRUE)) {
#ifdef __FreeBSD__
/* /*
* Don't mark the user's request for this BDR * Don't mark the user's request for this BDR
* as completing with CAM_BDR_SENT. CAM3 * as completing with CAM_BDR_SENT. CAM3
@ -1291,7 +1283,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
ROLE_INITIATOR)) { ROLE_INITIATOR)) {
aic_set_transaction_status(scb, CAM_REQ_CMP); aic_set_transaction_status(scb, CAM_REQ_CMP);
} }
#endif
ahc_compile_devinfo(&devinfo, ahc_compile_devinfo(&devinfo,
initiator_role_id, initiator_role_id,
target, target,
@ -3878,23 +3869,11 @@ ahc_alloc(void *platform_arg, char *name)
struct ahc_softc *ahc; struct ahc_softc *ahc;
int i; int i;
#ifndef __FreeBSD__
ahc = malloc(sizeof(*ahc), M_DEVBUF, M_NOWAIT);
if (!ahc) {
printf("aic7xxx: cannot malloc softc!\n");
free(name, M_DEVBUF);
return NULL;
}
#else
ahc = device_get_softc((device_t)platform_arg); ahc = device_get_softc((device_t)platform_arg);
#endif
memset(ahc, 0, sizeof(*ahc)); memset(ahc, 0, sizeof(*ahc));
ahc->seep_config = malloc(sizeof(*ahc->seep_config), ahc->seep_config = malloc(sizeof(*ahc->seep_config),
M_DEVBUF, M_NOWAIT); M_DEVBUF, M_NOWAIT);
if (ahc->seep_config == NULL) { if (ahc->seep_config == NULL) {
#ifndef __FreeBSD__
free(ahc, M_DEVBUF);
#endif
free(name, M_DEVBUF); free(name, M_DEVBUF);
return (NULL); return (NULL);
} }
@ -4041,17 +4020,13 @@ ahc_free(struct ahc_softc *ahc)
case 2: case 2:
aic_dma_tag_destroy(ahc, ahc->shared_data_dmat); aic_dma_tag_destroy(ahc, ahc->shared_data_dmat);
case 1: case 1:
#ifndef __linux__
aic_dma_tag_destroy(ahc, ahc->buffer_dmat); aic_dma_tag_destroy(ahc, ahc->buffer_dmat);
#endif
break; break;
case 0: case 0:
break; break;
} }
#ifndef __linux__
aic_dma_tag_destroy(ahc, ahc->parent_dmat); aic_dma_tag_destroy(ahc, ahc->parent_dmat);
#endif
ahc_platform_free(ahc); ahc_platform_free(ahc);
ahc_fini_scbdata(ahc); ahc_fini_scbdata(ahc);
for (i = 0; i < AHC_NUM_TARGETS; i++) { for (i = 0; i < AHC_NUM_TARGETS; i++) {
@ -4085,9 +4060,6 @@ ahc_free(struct ahc_softc *ahc)
free(ahc->name, M_DEVBUF); free(ahc->name, M_DEVBUF);
if (ahc->seep_config != NULL) if (ahc->seep_config != NULL)
free(ahc->seep_config, M_DEVBUF); free(ahc->seep_config, M_DEVBUF);
#ifndef __FreeBSD__
free(ahc, M_DEVBUF);
#endif
return; return;
} }
@ -4537,9 +4509,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
newcount = MIN(newcount, (AHC_SCB_MAX_ALLOC - scb_data->numscbs)); newcount = MIN(newcount, (AHC_SCB_MAX_ALLOC - scb_data->numscbs));
for (i = 0; i < newcount; i++) { for (i = 0; i < newcount; i++) {
struct scb_platform_data *pdata; struct scb_platform_data *pdata;
#ifndef __linux__
int error; int error;
#endif
pdata = (struct scb_platform_data *)malloc(sizeof(*pdata), pdata = (struct scb_platform_data *)malloc(sizeof(*pdata),
M_DEVBUF, M_NOWAIT); M_DEVBUF, M_NOWAIT);
if (pdata == NULL) if (pdata == NULL)
@ -4554,12 +4524,11 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg); next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg);
next_scb->ahc_softc = ahc; next_scb->ahc_softc = ahc;
next_scb->flags = SCB_FLAG_NONE; next_scb->flags = SCB_FLAG_NONE;
#ifndef __linux__
error = aic_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0, error = aic_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0,
&next_scb->dmamap); &next_scb->dmamap);
if (error != 0) if (error != 0)
break; break;
#endif
next_scb->hscb = &scb_data->hscbs[scb_data->numscbs]; next_scb->hscb = &scb_data->hscbs[scb_data->numscbs];
next_scb->hscb->tag = ahc->scb_data->numscbs; next_scb->hscb->tag = ahc->scb_data->numscbs;
aic_timer_init(&next_scb->io_timer); aic_timer_init(&next_scb->io_timer);
@ -4860,7 +4829,6 @@ ahc_init(struct ahc_softc *ahc)
if ((AHC_TMODE_ENABLE & (0x1 << ahc->unit)) == 0) if ((AHC_TMODE_ENABLE & (0x1 << ahc->unit)) == 0)
ahc->features &= ~AHC_TARGETMODE; ahc->features &= ~AHC_TARGETMODE;
#ifndef __linux__
/* DMA tag for mapping buffers into device visible space. */ /* DMA tag for mapping buffers into device visible space. */
if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1, if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
/*boundary*/BUS_SPACE_MAXADDR_32BIT + 1, /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
@ -4876,7 +4844,6 @@ ahc_init(struct ahc_softc *ahc)
&ahc->buffer_dmat) != 0) { &ahc->buffer_dmat) != 0) {
return (ENOMEM); return (ENOMEM);
} }
#endif
ahc->init_level++; ahc->init_level++;

4
sys/dev/aic7xxx/aic7xxx.h
View File

@ -589,9 +589,7 @@ struct scb {
aic_io_ctx_t io_ctx; aic_io_ctx_t io_ctx;
struct ahc_softc *ahc_softc; struct ahc_softc *ahc_softc;
scb_flag flags; scb_flag flags;
#ifndef __linux__
bus_dmamap_t dmamap; bus_dmamap_t dmamap;
#endif
struct scb_platform_data *platform_data; struct scb_platform_data *platform_data;
struct sg_map_node *sg_map; struct sg_map_node *sg_map;
struct ahc_dma_seg *sg_list; struct ahc_dma_seg *sg_list;
@ -932,9 +930,7 @@ typedef void ahc_callback_t (void *);
struct ahc_softc { struct ahc_softc {
bus_space_tag_t tag; bus_space_tag_t tag;
bus_space_handle_t bsh; bus_space_handle_t bsh;
#ifndef __linux__
bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */
#endif
struct scb_data *scb_data; struct scb_data *scb_data;
struct scb *next_queued_scb; struct scb *next_queued_scb;

7
sys/dev/aic7xxx/aic7xxx_93cx6.c
View File

@ -64,16 +64,9 @@
* bit to be sent from the chip. * bit to be sent from the chip.
*/ */
#ifdef __linux__
#include "aic7xxx_osm.h"
#include "aic7xxx_inline.h"
#include "aic7xxx_93cx6.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aic7xxx_inline.h>
#include <dev/aic7xxx/aic7xxx_93cx6.h> #include <dev/aic7xxx/aic7xxx_93cx6.h>
#endif
/* /*
* Right now, we only have to read the SEEPROM. But we make it easier to * Right now, we only have to read the SEEPROM. But we make it easier to

1
sys/dev/aic7xxx/aic7xxx_osm.c
View File

@ -31,7 +31,6 @@
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#20 $ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#20 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aic7xxx_inline.h>

7
sys/dev/aic7xxx/aic7xxx_pci.c
View File

@ -44,16 +44,9 @@
* $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $
*/ */
#ifdef __linux__
#include "aic7xxx_osm.h"
#include "aic7xxx_inline.h"
#include "aic7xxx_93cx6.h"
#else
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
#include <dev/aic7xxx/aic7xxx_inline.h> #include <dev/aic7xxx/aic7xxx_inline.h>
#include <dev/aic7xxx/aic7xxx_93cx6.h> #include <dev/aic7xxx/aic7xxx_93cx6.h>
#endif
static __inline uint64_t static __inline uint64_t
ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)

1
sys/dev/aic7xxx/aic7xxx_reg_print.c
View File

@ -6,7 +6,6 @@
* $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
*/ */
#include <sys/cdefs.h>
#include <dev/aic7xxx/aic7xxx_osm.h> #include <dev/aic7xxx/aic7xxx_osm.h>
static ahc_reg_parse_entry_t SCSISEQ_parse_table[] = { static ahc_reg_parse_entry_t SCSISEQ_parse_table[] = {