Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fixes captured by modern toolchain #88

Merged
merged 2 commits into from
Jan 18, 2019
Merged

Some fixes captured by modern toolchain #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf0907
Update ps2cam.c
AKuHAK Jan 17, 2019
62cef87
Fixed warnings: This clauses does not guard statements, but the latte…
AKuHAK Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ee/libc/src/stdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,10 @@ FILE *fdopen(int fd, const char *mode)
int fileno(FILE * f) {
if (f->fd > 0)
return f->fd;
else
else {
errno = EBADF;
return -1;
}
}
#endif

Expand Down
12 changes: 6 additions & 6 deletions iop/memorycard/mcman/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,8 @@ int McRead(int fd, void *buf, int length) // Export #8
else
r = mcman_read1(fd, buf, length);

if (r < 0)
fh->status = 0;
if (r < 0)
fh->status = 0;

if (r < -9) {
mcman_invhandles(fh->port, fh->slot);
Expand Down Expand Up @@ -861,8 +861,8 @@ int McWrite(int fd, void *buf, int length) // Export #9
else
r = mcman_write1(fd, buf, length);

if (r < 0)
fh->status = 0;
if (r < 0)
fh->status = 0;

if (r < -9) {
mcman_invhandles(fh->port, fh->slot);
Expand Down Expand Up @@ -940,8 +940,8 @@ int mcman_dread(int fd, fio_dirent_t *dirent)
else
r = mcman_dread1(fd, dirent);

if (r < 0)
fh->status = 0;
if (r < 0)
fh->status = 0;

if (r < -9) {
mcman_invhandles(fh->port, fh->slot);
Expand Down
2 changes: 1 addition & 1 deletion iop/system/padman/src/padPortOpen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static void QueryPadThread(void *arg)

if(pstate->disconnected != 0)
{
for(i=0; i < 6; i++);
for(i=0; i < 6; i++)
pstate->ee_actAlignData.data[i] = 0xFF;
}

Expand Down
10 changes: 5 additions & 5 deletions iop/usb/camera/src/ps2cam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,31 +163,31 @@ int PS2CamProbe(int devId)
if(intf->bInterfaceClass == USB_CLASS_VENDOR_SPEC)
{
// eyetoy 1
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY);
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY)
{
return 1;
}

// eyetoy 2
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY2);
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY2)
{
return 1;
}

// eyetoy 3
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY3);
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY3)
{
return 1;
}

// eyetoy 4
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY4);
if(dev->idVendor == PS2CAM_VEND_SONY && dev->idProduct == PS2CAM_PROD_EYETOY4)
{
return 1;
}

// D-Link VisualStream DSB-C310
if(dev->idVendor == PS2CAM_VEND_DLINK && dev->idProduct == PS2CAM_PROD_VISUALSTREAM);
if(dev->idVendor == PS2CAM_VEND_DLINK && dev->idProduct == PS2CAM_PROD_VISUALSTREAM)
{
return 1;
}
Expand Down