Fix Book-E/MPC85XX build. Some prototypes were wrong and got revealed with
the recent kobj signature checking.
This commit is contained in:
parent
a8675cae2b
commit
661ee6eea5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194101
@ -58,7 +58,7 @@ static int sec_attach(device_t dev);
|
||||
static int sec_detach(device_t dev);
|
||||
static int sec_suspend(device_t dev);
|
||||
static int sec_resume(device_t dev);
|
||||
static void sec_shutdown(device_t dev);
|
||||
static int sec_shutdown(device_t dev);
|
||||
static void sec_primary_intr(void *arg);
|
||||
static void sec_secondary_intr(void *arg);
|
||||
static int sec_setup_intr(struct sec_softc *sc, struct resource **ires,
|
||||
@ -500,9 +500,11 @@ sec_resume(device_t dev)
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
static int
|
||||
sec_shutdown(device_t dev)
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -313,7 +313,7 @@ tsec_detach(struct tsec_softc *sc)
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
int
|
||||
tsec_shutdown(device_t dev)
|
||||
{
|
||||
struct tsec_softc *sc;
|
||||
@ -323,6 +323,7 @@ tsec_shutdown(device_t dev)
|
||||
TSEC_GLOBAL_LOCK(sc);
|
||||
tsec_stop(sc);
|
||||
TSEC_GLOBAL_UNLOCK(sc);
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
@ -1582,7 +1583,7 @@ tsec_miibus_readreg(device_t dev, int phy, int reg)
|
||||
return (TSEC_READ(sc, TSEC_REG_MIIMSTAT));
|
||||
}
|
||||
|
||||
void
|
||||
int
|
||||
tsec_miibus_writereg(device_t dev, int phy, int reg, int value)
|
||||
{
|
||||
struct tsec_softc *sc;
|
||||
@ -1606,6 +1607,8 @@ tsec_miibus_writereg(device_t dev, int phy, int reg, int value)
|
||||
|
||||
if (timeout == 0)
|
||||
device_printf(dev, "Timeout while writing to PHY!\n");
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -358,10 +358,10 @@ void tsec_receive_intr(void *arg);
|
||||
void tsec_transmit_intr(void *arg);
|
||||
|
||||
int tsec_miibus_readreg(device_t dev, int phy, int reg);
|
||||
void tsec_miibus_writereg(device_t dev, int phy, int reg, int value);
|
||||
int tsec_miibus_writereg(device_t dev, int phy, int reg, int value);
|
||||
void tsec_miibus_statchg(device_t dev);
|
||||
int tsec_resume(device_t dev); /* XXX */
|
||||
void tsec_shutdown(device_t dev);
|
||||
int tsec_shutdown(device_t dev);
|
||||
int tsec_suspend(device_t dev); /* XXX */
|
||||
|
||||
void tsec_get_hwaddr(struct tsec_softc *sc, uint8_t *addr);
|
||||
|
@ -275,8 +275,8 @@ void pmap_bootstrap_ap(volatile uint32_t *);
|
||||
static void mmu_booke_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t);
|
||||
static void mmu_booke_clear_modify(mmu_t, vm_page_t);
|
||||
static void mmu_booke_clear_reference(mmu_t, vm_page_t);
|
||||
static void mmu_booke_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t,
|
||||
vm_offset_t);
|
||||
static void mmu_booke_copy(mmu_t, pmap_t, pmap_t, vm_offset_t,
|
||||
vm_size_t, vm_offset_t);
|
||||
static void mmu_booke_copy_page(mmu_t, vm_page_t, vm_page_t);
|
||||
static void mmu_booke_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t,
|
||||
vm_prot_t, boolean_t);
|
||||
@ -1890,8 +1890,8 @@ mmu_booke_deactivate(mmu_t mmu, struct thread *td)
|
||||
* This routine is only advisory and need not do anything.
|
||||
*/
|
||||
static void
|
||||
mmu_booke_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr,
|
||||
vm_size_t len, vm_offset_t src_addr)
|
||||
mmu_booke_copy(mmu_t mmu, pmap_t dst_pmap, pmap_t src_pmap,
|
||||
vm_offset_t dst_addr, vm_size_t len, vm_offset_t src_addr)
|
||||
{
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user