Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338252
b: refs/heads/master
c: b1a21ee
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent fabb9f3 commit 86a2f69
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d0cdf020ed306ac2c9a6ecb2e41120599c751fbf
refs/heads/master: b1a21ee9deb2492cbff38943dd6fa502161319a6
4 changes: 2 additions & 2 deletions trunk/drivers/staging/ced1401/ced_ioc.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ bool Is1401(DEVICE_EXTENSION * pdx)
}

if (iReturn == 0) // if all is OK...
iReturn = state == 0; // then sucess is that the state is 0
iReturn = state == 0; // then success is that the state is 0
} else
iReturn = 0; // we failed
pdx->bForceReset = false; // Clear forced reset flag now
Expand Down Expand Up @@ -565,7 +565,7 @@ int LineCount(DEVICE_EXTENSION * pdx)
if (dwIndex >= INBUF_SZ) // see if we fall off buff
dwIndex = 0;
}
while (dwIndex != dwEnd); // go to last avaliable
while (dwIndex != dwEnd); // go to last available
}

spin_unlock_irq(&pdx->charInLock);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/ced1401/usb1401.c
Original file line number Diff line number Diff line change
Expand Up @@ -911,9 +911,9 @@ static bool ReadWord(unsigned short *pWord, char *pBuf, unsigned int *pdDone,
** ReadHuff
**
** Reads a coded number in and returns it, Code is:
** If data is in range 0..127 we recieve 1 byte. If data in range 128-16383
** we recieve two bytes, top bit of first indicates another on its way. If
** data in range 16383-4194303 we get three bytes, top two bits of first set
** If data is in range 0..127 we receive 1 byte. If data in range 128-16383
** we receive two bytes, top bit of first indicates another on its way. If
** data in range 16384-4194303 we get three bytes, top two bits of first set
** to indicate three byte total.
**
*****************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ced1401/usb1401.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ typedef struct _DEVICE_EXTENSION

// Parameters relating to a block read\write that is in progress. Some of these values
// are equivalent to values in rDMAInfo. The values here are those in use, while those
// in rDMAInfo are those recieved from the 1401 via an escape sequence. If another
// in rDMAInfo are those received from the 1401 via an escape sequence. If another
// escape sequence arrives before the previous xfer ends, rDMAInfo values are updated while these
// are used to finish off the current transfer.
volatile short StagedId; // The transfer area id for this transfer
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/ced1401/userspace/use1401.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
** You should add a new one of these to keep things tidy for applications.
**
** DRIVERET_MAX (below) specifies the maximum allowed type code from the
** 1401 driver; I have set this high to accomodate as yet undesigned 1401
** 1401 driver; I have set this high to accommodate as yet undesigned 1401
** types. Similarly, as long as the command file names follow the ARM,
** ARN, ARO sequence, these are calculated by the ExtForType function, so
** you don't need to do anything here either.
Expand All @@ -160,7 +160,7 @@
** have broken backwards compatibility. Minor number changes mean that we
** have added new functionality that does not break backwards compatibility.
** we starts at 0. Revision changes mean we have fixed something. Each index
** returns to 0 when a higer one changes.
** returns to 0 when a higher one changes.
*/
#define U14LIB_MAJOR 4
#define U14LIB_MINOR 0
Expand Down Expand Up @@ -211,7 +211,7 @@

/*
** These are the 1401 type codes returned by the driver, they are a slightly
** odd sequence & start for reasons of compatability with the DOS driver.
** odd sequence & start for reasons of compatibility with the DOS driver.
** The maximum code value is the upper limit of 1401 device types.
*/
#define DRIVRET_STD 4 // Codes for 1401 types matching driver values
Expand Down Expand Up @@ -2327,7 +2327,7 @@ U14API(short) U14SetTransArea(short hand, WORD wArea, void *pvBuff,

/****************************************************************************
** U14SetTransferEvent Sets an event for notification of application
** wArea The tranfer area index, from 0 to MAXAREAS-1
** wArea The transfer area index, from 0 to MAXAREAS-1
** bEvent True to create an event, false to remove it
** bToHost Set 0 for notification on to1401 tranfers, 1 for
** notification of transfers to the host PC
Expand Down

0 comments on commit 86a2f69

Please sign in to comment.