d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge: cleanup: use consistent types for NVRAM partitions

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Reviewed by:    gnn
Sponsored by:   Solarflare Communications, Inc.
MFC after:      2 days
Differential Revision: https://reviews.freebsd.org/D4887
This commit is contained in:
Andrew Rybchenko 2016-01-12 15:31:20 +00:00
parent 0c24a07e20
commit 8eea4a0acb
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/sfxge/common/hunt_impl.h
View File

@ -361,18 +361,18 @@ ef10_nvram_partn_write_segment_tlv(
extern __checkReturn efx_rc_t
ef10_nvram_partn_size(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out size_t *sizep);
extern __checkReturn efx_rc_t
ef10_nvram_partn_lock(
__in efx_nic_t *enp,
__in unsigned int partn);
__in uint32_t partn);
extern __checkReturn efx_rc_t
ef10_nvram_partn_read(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size);
@ -380,14 +380,14 @@ ef10_nvram_partn_read(
extern __checkReturn efx_rc_t
ef10_nvram_partn_erase(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__in size_t size);
extern __checkReturn efx_rc_t
ef10_nvram_partn_write(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size);
@ -395,7 +395,7 @@ ef10_nvram_partn_write(
extern void
ef10_nvram_partn_unlock(
__in efx_nic_t *enp,
__in unsigned int partn);
__in uint32_t partn);
#endif /* EFSYS_OPT_NVRAM || EFSYS_OPT_VPD */
@ -457,7 +457,7 @@ ef10_nvram_rw_finish(
extern __checkReturn efx_rc_t
ef10_nvram_partn_set_version(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in_ecount(4) uint16_t version[4]);
extern __checkReturn efx_rc_t

16
sys/dev/sfxge/common/hunt_nvram.c
View File

@ -1288,7 +1288,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_size(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out size_t *sizep)
{
efx_rc_t rc;
@ -1308,7 +1308,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_lock(
__in efx_nic_t *enp,
__in unsigned int partn)
__in uint32_t partn)
{
efx_rc_t rc;
@ -1326,7 +1326,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_read(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size)
@ -1358,7 +1358,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_erase(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__in size_t size)
{
@ -1403,7 +1403,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_write(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size)
@ -1457,7 +1457,7 @@ fail1:
void
ef10_nvram_partn_unlock(
__in efx_nic_t *enp,
__in unsigned int partn)
__in uint32_t partn)
{
boolean_t reboot;
efx_rc_t rc;
@ -1475,7 +1475,7 @@ fail1:
__checkReturn efx_rc_t
ef10_nvram_partn_set_version(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in_ecount(4) uint16_t version[4])
{
struct tlv_partition_version partn_version;
@ -1911,7 +1911,7 @@ ef10_nvram_set_version(
__in_ecount(4) uint16_t version[4])
{
ef10_parttbl_entry_t *entry;
unsigned int partn;
uint32_t partn;
efx_rc_t rc;
if ((entry = ef10_parttbl_entry(enp, type)) == NULL) {

16
sys/dev/sfxge/common/siena_impl.h
View File

@ -158,18 +158,18 @@ siena_mcdi_feature_supported(
extern __checkReturn efx_rc_t
siena_nvram_partn_size(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out size_t *sizep);
extern __checkReturn efx_rc_t
siena_nvram_partn_lock(
__in efx_nic_t *enp,
__in unsigned int partn);
__in uint32_t partn);
extern __checkReturn efx_rc_t
siena_nvram_partn_read(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size);
@ -177,14 +177,14 @@ siena_nvram_partn_read(
extern __checkReturn efx_rc_t
siena_nvram_partn_erase(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__in size_t size);
extern __checkReturn efx_rc_t
siena_nvram_partn_write(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size);
@ -192,12 +192,12 @@ siena_nvram_partn_write(
extern void
siena_nvram_partn_unlock(
__in efx_nic_t *enp,
__in unsigned int partn);
__in uint32_t partn);
extern __checkReturn efx_rc_t
siena_nvram_get_dynamic_cfg(
__in efx_nic_t *enp,
__in unsigned int index,
__in uint32_t partn,
__in boolean_t vpd,
__out siena_mc_dynamic_config_hdr_t **dcfgp,
__out size_t *sizep);
@ -223,7 +223,7 @@ siena_nvram_size(
extern __checkReturn efx_rc_t
siena_nvram_get_subtype(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out uint32_t *subtypep);
extern __checkReturn efx_rc_t

20
sys/dev/sfxge/common/siena_nvram.c
View File

@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
__checkReturn efx_rc_t
siena_nvram_partn_size(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out size_t *sizep)
{
efx_rc_t rc;
@ -72,7 +72,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_partn_lock(
__in efx_nic_t *enp,
__in unsigned int partn)
__in uint32_t partn)
{
efx_rc_t rc;
@ -91,7 +91,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_partn_read(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size)
@ -123,7 +123,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_partn_erase(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__in size_t size)
{
@ -144,7 +144,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_partn_write(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in unsigned int offset,
__out_bcount(size) caddr_t data,
__in size_t size)
@ -176,7 +176,7 @@ fail1:
void
siena_nvram_partn_unlock(
__in efx_nic_t *enp,
__in unsigned int partn)
__in uint32_t partn)
{
boolean_t reboot;
efx_rc_t rc;
@ -326,7 +326,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_get_dynamic_cfg(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__in boolean_t vpd,
__out siena_mc_dynamic_config_hdr_t **dcfgp,
__out size_t *sizep)
@ -455,7 +455,7 @@ fail1:
__checkReturn efx_rc_t
siena_nvram_get_subtype(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__out uint32_t *subtypep)
{
efx_mcdi_req_t req;
@ -515,8 +515,8 @@ siena_nvram_get_version(
{
siena_mc_dynamic_config_hdr_t *dcfg;
siena_parttbl_entry_t *entry;
unsigned int dcfg_partn;
unsigned int partn;
uint32_t dcfg_partn;
uint32_t partn;
unsigned int i;
efx_rc_t rc;

4
sys/dev/sfxge/common/siena_vpd.c
View File

@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
static __checkReturn efx_rc_t
siena_vpd_get_static(
__in efx_nic_t *enp,
__in unsigned int partn,
__in uint32_t partn,
__deref_out_bcount_opt(*sizep) caddr_t *svpdp,
__out size_t *sizep)
{
@ -207,7 +207,7 @@ siena_vpd_size(
__out size_t *sizep)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
unsigned int partn;
uint32_t partn;
efx_rc_t rc;
EFSYS_ASSERT(enp->en_family == EFX_FAMILY_SIENA);