summaryrefslogtreecommitdiffstats
path: root/sys/dev/ppc
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2009-02-05 19:31:55 +0000
committerimp <imp@FreeBSD.org>2009-02-05 19:31:55 +0000
commit10f81d10bb5b1fb0081a7f2b1fc35fc512cdc3bf (patch)
treeec11e331c577faf7e03f63bba57728389c66cb2f /sys/dev/ppc
parent41dda7f4c2a0922daecbd9547fa6c63cf802731e (diff)
downloadFreeBSD-src-10f81d10bb5b1fb0081a7f2b1fc35fc512cdc3bf.zip
FreeBSD-src-10f81d10bb5b1fb0081a7f2b1fc35fc512cdc3bf.tar.gz
reset_epp and ecp_sync both return int.
Diffstat (limited to 'sys/dev/ppc')
-rw-r--r--sys/dev/ppc/ppc.c14
-rw-r--r--sys/dev/ppc/ppcvar.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 2ad788e..1322a33 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -115,7 +115,7 @@ static char *ppc_epp_protocol[] = { " (EPP 1.9)", " (EPP 1.7)", 0 };
/*
* ppc_ecp_sync() XXX
*/
-void
+int
ppc_ecp_sync(device_t dev)
{
int i, r;
@@ -123,22 +123,22 @@ ppc_ecp_sync(device_t dev)
PPC_ASSERT_LOCKED(ppc);
if (!(ppc->ppc_avm & PPB_ECP) && !(ppc->ppc_dtm & PPB_ECP))
- return;
+ return 0;
r = r_ecr(ppc);
if ((r & 0xe0) != PPC_ECR_EPP)
- return;
+ return 0;
for (i = 0; i < 100; i++) {
r = r_ecr(ppc);
if (r & 0x1)
- return;
+ return 0;
DELAY(100);
}
device_printf(dev, "ECP sync failed as data still present in FIFO.\n");
- return;
+ return 0;
}
/*
@@ -1613,7 +1613,7 @@ ppc_write(device_t dev, char *buf, int len, int how)
return (EINVAL);
}
-void
+int
ppc_reset_epp(device_t dev)
{
struct ppc_data *ppc = DEVTOSOFTC(dev);
@@ -1621,7 +1621,7 @@ ppc_reset_epp(device_t dev)
PPC_ASSERT_LOCKED(ppc);
ppc_reset_epp_timeout(ppc);
- return;
+ return 0;
}
int
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index a8b1a92..faff75a 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -44,8 +44,8 @@ struct resource *ppc_alloc_resource(device_t bus, device_t child, int type,
int *rid, u_long start, u_long end, u_long count, u_int flags);
int ppc_release_resource(device_t bus, device_t child, int type, int rid,
struct resource *r);
-void ppc_reset_epp(device_t);
-void ppc_ecp_sync(device_t);
+int ppc_reset_epp(device_t);
+int ppc_ecp_sync(device_t);
int ppc_setmode(device_t, int);
extern devclass_t ppc_devclass;
OpenPOWER on IntegriCloud