hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-01 00:18:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more ifdefs to fix build with GCC after r286406.

Browse Source
This commit is contained in:
Alexander Motin 2015-08-07 14:12:51 +00:00
parent 7a3151955b
commit 3301406331
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/cam/ctl/ctl.c
View File

@ -374,9 +374,11 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, debug, CTLFLAG_RWTUN,
*/
#define SCSI_EVPD_NUM_SUPPORTED_PAGES 10
#ifdef notyet
static void ctl_isc_event_handler(ctl_ha_channel chanel, ctl_ha_event event,
int param);
static void ctl_copy_sense_data(union ctl_ha_msg *src, union ctl_io *dest);
#endif
static int ctl_init(void);
void ctl_shutdown(void);
static int ctl_open(struct cdev *dev, int flags, int fmt, struct thread *td);
@ -444,7 +446,9 @@ static int ctl_scsiio_lun_check(struct ctl_lun *lun,
const struct ctl_cmd_entry *entry,
struct ctl_scsiio *ctsio);
//static int ctl_check_rtr(union ctl_io *pending_io, struct ctl_softc *softc);
#ifdef notyet
static void ctl_failover(void);
#endif
static void ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
ctl_ua_type ua_type);
static int ctl_scsiio_precheck(struct ctl_softc *ctl_softc,
@ -483,7 +487,9 @@ static void ctl_work_thread(void *arg);
static void ctl_enqueue_incoming(union ctl_io *io);
static void ctl_enqueue_rtr(union ctl_io *io);
static void ctl_enqueue_done(union ctl_io *io);
#ifdef notyet
static void ctl_enqueue_isc(union ctl_io *io);
#endif
static const struct ctl_cmd_entry *
ctl_get_cmd_entry(struct ctl_scsiio *ctsio, int *sa);
static const struct ctl_cmd_entry *
@ -528,6 +534,7 @@ static struct ctl_frontend ioctl_frontend =
.name = "ioctl",
};
#ifdef notyet
static void
ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
union ctl_ha_msg *msg_info)
@ -962,6 +969,7 @@ ctl_copy_sense_data(union ctl_ha_msg *src, union ctl_io *dest)
dest->scsiio.sense_len = src->scsi.sense_len;
dest->io_hdr.status = src->hdr.status;
}
#endif
static void
ctl_est_ua(struct ctl_lun *lun, uint32_t initidx, ctl_ua_type ua)
@ -11369,6 +11377,7 @@ ctl_failover_io(union ctl_io *io, int have_lock)
ctl_done(io);
}
#ifdef notyet
static void
ctl_failover(void)
{
@ -11609,6 +11618,7 @@ ctl_failover(void)
ctl_pause_rtr = 0;
mtx_unlock(&softc->ctl_lock);
}
#endif
static void
ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
@ -14252,6 +14262,7 @@ ctl_enqueue_done(union ctl_io *io)
wakeup(thr);
}
#ifdef notyet
static void
ctl_enqueue_isc(union ctl_io *io)
{
@ -14273,7 +14284,6 @@ ctl_init_isc_msg(void)
printf("CTL: Still calling this thing\n");
}
#ifdef notyet
/*
* Init component
* Initializes component into configuration defined by bootMode

2
sys/cam/ctl/ctl.h
View File

@ -191,7 +191,9 @@ void ctl_data_submit_done(union ctl_io *io);
void ctl_config_read_done(union ctl_io *io);
void ctl_config_write_done(union ctl_io *io);
void ctl_portDB_changed(int portnum);
#ifdef notyet
void ctl_init_isc_msg(void);
#endif
/*
* KPI to manipulate LUN/port options