Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141585
b: refs/heads/master
c: f3fd093
h: refs/heads/master
i:
  141583: 071c305
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 467308d commit 1aa9fc9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: 5671c0c2d85203472b02100a517ce5c565e5c1e0
refs/heads/master: f3fd0937adacadd368126d1999d1060390497915
9 changes: 5 additions & 4 deletions trunk/drivers/staging/comedi/drivers/jr3_pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ struct six_axis_array {
* have two force vectors, set changeV1 to 1.
*/

typedef enum {
/* vect_bits appears to be unused at this time */
enum {
fx = 0x0001,
fy = 0x0002,
fz = 0x0004,
Expand All @@ -108,7 +109,7 @@ typedef enum {
* exceeded the near saturation value.
*/

typedef enum {
enum {
fx_near_sat = 0x0001,
fy_near_sat = 0x0002,
fz_near_sat = 0x0004,
Expand Down Expand Up @@ -176,7 +177,7 @@ typedef enum {
* the sensor data is not being received correctly.
*/

typedef enum {
enum error_bits_t {
fx_sat = 0x0001,
fy_sat = 0x0002,
fz_sat = 0x0004,
Expand All @@ -189,7 +190,7 @@ typedef enum {
cal_crc_bad = 0x2000,
watch_dog2 = 0x4000,
watch_dog = 0x8000
} error_bits_t;
};

/* THRESH_STRUCT */

Expand Down

0 comments on commit 1aa9fc9

Please sign in to comment.