summaryrefslogtreecommitdiffstats
path: root/sys/dev/sfxge/common/efx_impl.h
diff options
context:
space:
mode:
authorarybchik <arybchik@FreeBSD.org>2016-01-20 07:48:49 +0000
committerarybchik <arybchik@FreeBSD.org>2016-01-20 07:48:49 +0000
commit13a2c477eb483ab6eb71b3d6bd2659dd62087d35 (patch)
treeb4e76194bf08753ee8439bfb8d3b0a36a1478320 /sys/dev/sfxge/common/efx_impl.h
parentd19037575e1ae08850aef077e01e5a9200e927dc (diff)
downloadFreeBSD-src-13a2c477eb483ab6eb71b3d6bd2659dd62087d35.zip
FreeBSD-src-13a2c477eb483ab6eb71b3d6bd2659dd62087d35.tar.gz
MFC r293889,r294080,r294093,r294201,r294249-r294252
sfxge: convert nvram methods to use partition id Submitted by: Andy Moreton <amoreton at solarflare.com> Sponsored by: Solarflare Communications, Inc.
Diffstat (limited to 'sys/dev/sfxge/common/efx_impl.h')
-rw-r--r--sys/dev/sfxge/common/efx_impl.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/sfxge/common/efx_impl.h b/sys/dev/sfxge/common/efx_impl.h
index 434ac68..7c4cc37 100644
--- a/sys/dev/sfxge/common/efx_impl.h
+++ b/sys/dev/sfxge/common/efx_impl.h
@@ -480,21 +480,21 @@ typedef struct efx_nvram_ops_s {
#if EFSYS_OPT_DIAG
efx_rc_t (*envo_test)(efx_nic_t *);
#endif /* EFSYS_OPT_DIAG */
- efx_rc_t (*envo_size)(efx_nic_t *, efx_nvram_type_t, size_t *);
- efx_rc_t (*envo_get_version)(efx_nic_t *, efx_nvram_type_t,
- uint32_t *, uint16_t *);
- efx_rc_t (*envo_rw_start)(efx_nic_t *, efx_nvram_type_t, size_t *);
- efx_rc_t (*envo_read_chunk)(efx_nic_t *, efx_nvram_type_t,
+ efx_rc_t (*envo_type_to_partn)(efx_nic_t *, efx_nvram_type_t,
+ uint32_t *);
+ efx_rc_t (*envo_partn_size)(efx_nic_t *, uint32_t, size_t *);
+ efx_rc_t (*envo_partn_rw_start)(efx_nic_t *, uint32_t, size_t *);
+ efx_rc_t (*envo_partn_read)(efx_nic_t *, uint32_t,
unsigned int, caddr_t, size_t);
- efx_rc_t (*envo_erase)(efx_nic_t *, efx_nvram_type_t);
- efx_rc_t (*envo_write_chunk)(efx_nic_t *, efx_nvram_type_t,
+ efx_rc_t (*envo_partn_erase)(efx_nic_t *, uint32_t,
+ unsigned int, size_t);
+ efx_rc_t (*envo_partn_write)(efx_nic_t *, uint32_t,
unsigned int, caddr_t, size_t);
- void (*envo_rw_finish)(efx_nic_t *, efx_nvram_type_t);
- efx_rc_t (*envo_set_version)(efx_nic_t *, efx_nvram_type_t,
+ void (*envo_partn_rw_finish)(efx_nic_t *, uint32_t);
+ efx_rc_t (*envo_partn_get_version)(efx_nic_t *, uint32_t,
+ uint32_t *, uint16_t *);
+ efx_rc_t (*envo_partn_set_version)(efx_nic_t *, uint32_t,
uint16_t *);
-
- efx_rc_t (*envo_type_to_partn)(efx_nic_t *, efx_nvram_type_t,
- uint32_t *);
} efx_nvram_ops_t;
#endif /* EFSYS_OPT_NVRAM */
OpenPOWER on IntegriCloud