Page MenuHomeFreeBSD
Files F137918700

D7447.id19158.diff
No OneTemporary
Actions

D7447.id19158.diff
View Options

Index: sys/contrib/ncsw/user/env/xx.c
===================================================================
--- sys/contrib/ncsw/user/env/xx.c
+++ sys/contrib/ncsw/user/env/xx.c
@@ -406,7 +406,7 @@
t_Error
XX_SetIntr(int irq, t_Isr *f_Isr, t_Handle handle)
{
- struct device *dev;
+ device_t dev;
struct resource *r;
unsigned int flags;
int err;
@@ -455,7 +455,7 @@
t_Error
XX_FreeIntr(int irq)
{
- struct device *dev;
+ device_t dev;
struct resource *r;
r = (struct resource *)irq;
Index: sys/contrib/octeon-sdk/cvmx-twsi.c
===================================================================
--- sys/contrib/octeon-sdk/cvmx-twsi.c
+++ sys/contrib/octeon-sdk/cvmx-twsi.c
@@ -85,7 +85,7 @@
resource_size_t twsi_phys;
void __iomem *twsi_base;
resource_size_t regsize;
- struct device *dev;
+ device_t dev;
int broken_irq_mode;
};
struct i2c_adapter *adapter;
Index: sys/dev/auxio/auxio.c
===================================================================
--- sys/dev/auxio/auxio.c
+++ sys/dev/auxio/auxio.c
@@ -98,7 +98,7 @@
#define AUXIO_PCIO_NREG 5
struct auxio_softc {
- struct device *sc_dev;
+ device_t sc_dev;
int sc_nauxio;
struct resource *sc_res[AUXIO_PCIO_NREG];
Index: sys/dev/bktr/bktr_os.c
===================================================================
--- sys/dev/bktr/bktr_os.c
+++ sys/dev/bktr/bktr_os.c
@@ -889,10 +889,11 @@
#if defined(__OpenBSD__)
static int bktr_probe(struct device *, void *, void *);
+static void bktr_attach(struct device *, struct device *, void *);
#else
-static int bktr_probe(struct device *, struct cfdata *, void *);
+static int bktr_probe(device_t, struct cfdata *, void *);
+static void bktr_attach(device_t, device_t, void *);
#endif
-static void bktr_attach(struct device *, struct device *, void *);
struct cfattach bktr_ca = {
sizeof(struct bktr_softc), bktr_probe, bktr_attach
@@ -908,10 +909,11 @@
int
bktr_probe(parent, match, aux)
- struct device *parent;
#if defined(__OpenBSD__)
+ struct device *parent;
void *match;
#else
+ device_t parent;
struct cfdata *match;
#endif
void *aux;
@@ -933,7 +935,15 @@
* the attach routine.
*/
static void
-bktr_attach(struct device *parent, struct device *self, void *aux)
+bktr_attach(parent, self, aux)
+#if defined(__OpenBSD__)
+ struct device *parent;
+ struct device *self;
+#else
+ device_t parent;
+ device_t self;
+#endif
+ void *aux;
{
bktr_ptr_t bktr;
u_long latency;
Index: sys/dev/bktr/bktr_reg.h
===================================================================
--- sys/dev/bktr/bktr_reg.h
+++ sys/dev/bktr/bktr_reg.h
@@ -35,7 +35,7 @@
*/
#ifdef __NetBSD__
-#include <machine/bus.h> /* struct device */
+#include <machine/bus.h> /* device_t */
#include <sys/device.h>
#include <sys/select.h> /* struct selinfo */
# ifdef DEBUG
Index: sys/dev/e1000/e1000_osdep.h
===================================================================
--- sys/dev/e1000/e1000_osdep.h
+++ sys/dev/e1000/e1000_osdep.h
@@ -134,7 +134,7 @@
bus_space_handle_t io_bus_space_handle;
bus_space_tag_t flash_bus_space_tag;
bus_space_handle_t flash_bus_space_handle;
- struct device *dev;
+ device_t dev;
};
#define E1000_REGISTER(hw, reg) (((hw)->mac.type >= e1000_82543) \
Index: sys/dev/e1000/if_em.h
===================================================================
--- sys/dev/e1000/if_em.h
+++ sys/dev/e1000/if_em.h
@@ -394,7 +394,7 @@
/* FreeBSD operating-system-specific structures. */
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *memory;
Index: sys/dev/e1000/if_igb.h
===================================================================
--- sys/dev/e1000/if_igb.h
+++ sys/dev/e1000/if_igb.h
@@ -429,7 +429,7 @@
struct e1000_hw hw;
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *pci_mem;
Index: sys/dev/e1000/if_lem.h
===================================================================
--- sys/dev/e1000/if_lem.h
+++ sys/dev/e1000/if_lem.h
@@ -298,7 +298,7 @@
/* FreeBSD operating-system-specific structures. */
struct e1000_osdep osdep;
- struct device *dev;
+ device_t dev;
struct cdev *led_dev;
struct resource *memory;
Index: sys/dev/ixgb/if_ixgb.h
===================================================================
--- sys/dev/ixgb/if_ixgb.h
+++ sys/dev/ixgb/if_ixgb.h
@@ -277,7 +277,7 @@
/* FreeBSD operating-system-specific structures */
struct ixgb_osdep osdep;
- struct device *dev;
+ device_t dev;
struct resource *res_memory;
struct resource *res_ioport;
struct resource *res_interrupt;
Index: sys/dev/ixgb/if_ixgb_osdep.h
===================================================================
--- sys/dev/ixgb/if_ixgb_osdep.h
+++ sys/dev/ixgb/if_ixgb_osdep.h
@@ -90,7 +90,7 @@
{
bus_space_tag_t mem_bus_space_tag;
bus_space_handle_t mem_bus_space_handle;
- struct device *dev;
+ device_t dev;
};
#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
Index: sys/dev/ixgbe/ixgbe.h
===================================================================
--- sys/dev/ixgbe/ixgbe.h
+++ sys/dev/ixgbe/ixgbe.h
@@ -458,7 +458,7 @@
struct ixgbe_hw hw;
struct ixgbe_osdep osdep;
- struct device *dev;
+ device_t dev;
struct ifnet *ifp;
struct resource *pci_mem;
Index: sys/dev/ixl/i40e_osdep.h
===================================================================
--- sys/dev/ixl/i40e_osdep.h
+++ sys/dev/ixl/i40e_osdep.h
@@ -151,7 +151,7 @@
bus_space_handle_t mem_bus_space_handle;
bus_size_t mem_bus_space_size;
uint32_t flush_reg;
- struct device *dev;
+ device_t dev;
};
struct i40e_dma_mem {
Index: sys/dev/ixl/ixl.h
===================================================================
--- sys/dev/ixl/ixl.h
+++ sys/dev/ixl/ixl.h
@@ -511,7 +511,7 @@
struct ixl_vsi {
void *back;
struct ifnet *ifp;
- struct device *dev;
+ device_t dev;
struct i40e_hw *hw;
struct ifmedia media;
enum i40e_vsi_type type;
Index: sys/dev/ixl/ixl_pf.h
===================================================================
--- sys/dev/ixl/ixl_pf.h
+++ sys/dev/ixl/ixl_pf.h
@@ -63,7 +63,7 @@
struct ixl_pf {
struct i40e_hw hw;
struct i40e_osdep osdep;
- struct device *dev;
+ device_t dev;
struct ixl_vsi vsi;
struct resource *pci_mem;
Index: sys/dev/ixl/ixlv.h
===================================================================
--- sys/dev/ixl/ixlv.h
+++ sys/dev/ixl/ixlv.h
@@ -115,7 +115,7 @@
struct ixlv_sc {
struct i40e_hw hw;
struct i40e_osdep osdep;
- struct device *dev;
+ device_t dev;
struct resource *pci_mem;
struct resource *msix_mem;
Index: sys/dev/netmap/netmap_mem2.c
===================================================================
--- sys/dev/netmap/netmap_mem2.c
+++ sys/dev/netmap/netmap_mem2.c
@@ -201,7 +201,7 @@
static int netmap_mem_map(struct netmap_obj_pool *, struct netmap_adapter *);
static int netmap_mem_unmap(struct netmap_obj_pool *, struct netmap_adapter *);
-static int nm_mem_assign_group(struct netmap_mem_d *, struct device *);
+static int nm_mem_assign_group(struct netmap_mem_d *, device_t);
#define NMA_LOCK_INIT(n) NM_MTX_INIT((n)->nm_mtx)
#define NMA_LOCK_DESTROY(n) NM_MTX_DESTROY((n)->nm_mtx)
@@ -456,7 +456,7 @@
}
static int
-nm_mem_assign_group(struct netmap_mem_d *nmd, struct device *dev)
+nm_mem_assign_group(struct netmap_mem_d *nmd, device_t dev)
{
int err = 0, id;
id = nm_iommu_group_id(dev);
Index: sys/dev/pci/pcivar.h
===================================================================
--- sys/dev/pci/pcivar.h
+++ sys/dev/pci/pcivar.h
@@ -174,7 +174,7 @@
/* config header information common to all header types */
typedef struct pcicfg {
- struct device *dev; /* device which owns this */
+ device_t dev; /* device which owns this */
STAILQ_HEAD(, pci_map) maps; /* BARs */
Index: sys/dev/sound/sbus/cs4231.c
===================================================================
--- sys/dev/sound/sbus/cs4231.c
+++ sys/dev/sound/sbus/cs4231.c
@@ -113,7 +113,7 @@
#define CS4231_RES_MEM_MAX 4
#define CS4231_RES_IRQ_MAX 2
struct cs4231_softc {
- struct device *sc_dev;
+ device_t sc_dev;
int sc_rid[CS4231_RES_MEM_MAX];
struct resource *sc_res[CS4231_RES_MEM_MAX];
bus_space_handle_t sc_regh[CS4231_RES_MEM_MAX];
Index: sys/dev/tpm/tpm.c
===================================================================
--- sys/dev/tpm/tpm.c
+++ sys/dev/tpm/tpm.c
@@ -175,8 +175,8 @@
NULL, "tpm", DV_DULL
};
-int tpm_match(struct device *, void *, void *);
-void tpm_attach(struct device *, struct device *, void *);
+int tpm_match(device_t , void *, void *);
+void tpm_attach(device_t , device_t , void *);
struct cfattach tpm_ca = {
sizeof(struct tpm_softc), tpm_match, tpm_attach
@@ -337,7 +337,7 @@
* OpenBSD specific code for probing and attaching TPM to device tree.
*/
int
-tpm_match(struct device *parent, void *match, void *aux)
+tpm_match(device_t parent, void *match, void *aux)
{
struct isa_attach_args *ia = aux;
struct cfdata *cf = match;
@@ -370,7 +370,7 @@
}
void
-tpm_attach(struct device *parent, struct device *self, void *aux)
+tpm_attach(device_t parent, device_t self, void *aux)
{
struct tpm_softc *sc = (struct tpm_softc *)self;
struct isa_attach_args *ia = aux;
Index: sys/kern/subr_bus.c
===================================================================
--- sys/kern/subr_bus.c
+++ sys/kern/subr_bus.c
@@ -1794,7 +1794,7 @@
dc = NULL;
}
- dev = malloc(sizeof(struct device), M_BUS, M_NOWAIT|M_ZERO);
+ dev = malloc(sizeof(*dev), M_BUS, M_NOWAIT|M_ZERO);
if (!dev)
return (NULL);
@@ -5278,7 +5278,7 @@
int *name = (int *)arg1;
u_int namelen = arg2;
int index;
- struct device *dev;
+ device_t dev;
struct u_device udev; /* XXX this is a bit big */
int error;
Index: sys/mips/nlm/dev/net/xlpge.c
===================================================================
--- sys/mips/nlm/dev/net/xlpge.c
+++ sys/mips/nlm/dev/net/xlpge.c
@@ -175,8 +175,8 @@
static int nlm_xlpge_shutdown(device_t);
/* mii override functions */
-static int nlm_xlpge_mii_read(struct device *, int, int);
-static int nlm_xlpge_mii_write(struct device *, int, int, int);
+static int nlm_xlpge_mii_read(device_t, int, int);
+static int nlm_xlpge_mii_write(device_t, int, int, int);
static void nlm_xlpge_mii_statchg(device_t);
static device_method_t nlm_xlpge_methods[] = {
@@ -1290,7 +1290,7 @@
* miibus function with custom implementation
*/
static int
-nlm_xlpge_mii_read(struct device *dev, int phyaddr, int regidx)
+nlm_xlpge_mii_read(device_t dev, int phyaddr, int regidx)
{
struct nlm_xlpge_softc *sc;
int val;
@@ -1306,7 +1306,7 @@
}
static int
-nlm_xlpge_mii_write(struct device *dev, int phyaddr, int regidx, int val)
+nlm_xlpge_mii_write(device_t dev, int phyaddr, int regidx, int val)
{
struct nlm_xlpge_softc *sc;
Index: sys/mips/rmi/dev/nlge/if_nlge.c
===================================================================
--- sys/mips/rmi/dev/nlge/if_nlge.c
+++ sys/mips/rmi/dev/nlge/if_nlge.c
@@ -140,8 +140,8 @@
static int nlge_tx(struct ifnet *ifp, struct mbuf *m);
static void nlge_rx(struct nlge_softc *sc, vm_paddr_t paddr, int len);
-static int nlge_mii_write(struct device *, int, int, int);
-static int nlge_mii_read(struct device *, int, int);
+static int nlge_mii_write(device_t, int, int, int);
+static int nlge_mii_read(device_t, int, int);
static void nlge_mac_mii_statchg(device_t);
static int nlge_mediachange(struct ifnet *ifp);
static void nlge_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr);
@@ -831,7 +831,7 @@
}
static int
-nlge_mii_write(struct device *dev, int phyaddr, int regidx, int regval)
+nlge_mii_write(device_t dev, int phyaddr, int regidx, int regval)
{
struct nlge_softc *sc;
@@ -843,7 +843,7 @@
}
static int
-nlge_mii_read(struct device *dev, int phyaddr, int regidx)
+nlge_mii_read(device_t dev, int phyaddr, int regidx)
{
struct nlge_softc *sc;
int val;
Index: sys/powerpc/include/bus_dma.h
===================================================================
--- sys/powerpc/include/bus_dma.h
+++ sys/powerpc/include/bus_dma.h
@@ -30,8 +30,6 @@
#include <sys/bus_dma.h>
-struct device;
-
-int bus_dma_tag_set_iommu(bus_dma_tag_t, struct device *iommu, void *cookie);
+int bus_dma_tag_set_iommu(bus_dma_tag_t, device_t iommu, void *cookie);
#endif /* _POWERPC_BUS_DMA_H_ */
Index: sys/powerpc/powerpc/busdma_machdep.c
===================================================================
--- sys/powerpc/powerpc/busdma_machdep.c
+++ sys/powerpc/powerpc/busdma_machdep.c
@@ -1210,7 +1210,7 @@
}
int
-bus_dma_tag_set_iommu(bus_dma_tag_t tag, struct device *iommu, void *cookie)
+bus_dma_tag_set_iommu(bus_dma_tag_t tag, device_t iommu, void *cookie)
{
tag->iommu = iommu;
tag->iommu_cookie = cookie;
Index: sys/sparc64/fhc/clkbrd.c
===================================================================
--- sys/sparc64/fhc/clkbrd.c
+++ sys/sparc64/fhc/clkbrd.c
@@ -52,7 +52,7 @@
#define CLKBRD_CLKVER 2
struct clkbrd_softc {
- struct device *sc_dev;
+ device_t sc_dev;
struct resource *sc_res[CLKBRD_NREG];
int sc_rid[CLKBRD_NREG];
bus_space_tag_t sc_bt[CLKBRD_NREG];
Index: sys/sys/pcpu.h
===================================================================
--- sys/sys/pcpu.h
+++ sys/sys/pcpu.h
@@ -160,7 +160,7 @@
struct lock_list_entry *pc_spinlocks;
struct vmmeter pc_cnt; /* VM stats counters */
long pc_cp_time[CPUSTATES]; /* statclock ticks */
- struct device *pc_device;
+ device_t pc_device;
void *pc_netisr; /* netisr SWI cookie */
int pc_unused1; /* unused field */
int pc_domain; /* Memory domain. */
Index: sys/sys/rman.h
===================================================================
--- sys/sys/rman.h
+++ sys/sys/rman.h
@@ -127,7 +127,7 @@
bus_space_handle_t rman_get_bushandle(struct resource *);
bus_space_tag_t rman_get_bustag(struct resource *);
rman_res_t rman_get_end(struct resource *);
-struct device *rman_get_device(struct resource *);
+device_t rman_get_device(struct resource *);
u_int rman_get_flags(struct resource *);
void rman_get_mapping(struct resource *, struct resource_map *);
int rman_get_rid(struct resource *);
@@ -145,13 +145,13 @@
int rman_release_resource(struct resource *r);
struct resource *rman_reserve_resource(struct rman *rm, rman_res_t start,
rman_res_t end, rman_res_t count,
- u_int flags, struct device *dev);
+ u_int flags, device_t dev);
struct resource *rman_reserve_resource_bound(struct rman *rm, rman_res_t start,
rman_res_t end, rman_res_t count, rman_res_t bound,
- u_int flags, struct device *dev);
+ u_int flags, device_t dev);
void rman_set_bushandle(struct resource *_r, bus_space_handle_t _h);
void rman_set_bustag(struct resource *_r, bus_space_tag_t _t);
-void rman_set_device(struct resource *_r, struct device *_dev);
+void rman_set_device(struct resource *_r, device_t _dev);
void rman_set_end(struct resource *_r, rman_res_t _end);
void rman_set_mapping(struct resource *, struct resource_map *);
void rman_set_rid(struct resource *_r, int _rid);

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 5:51 AM (15 m, 26 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26275777
Default Alt Text
D7447.id19158.diff (14 KB)

Event Timeline