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

reset_epp and ecp_sync both return int.

Browse Source
This commit is contained in:
imp 2009-02-05 19:31:55 +00:00
parent 41dda7f4c2
commit 10f81d10bb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ppc/ppc.c
View File

@ -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

4
sys/dev/ppc/ppcvar.h
View File

@ -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;