diff options
| author | root <root@usrp1-e.lan> | 2010-05-05 21:12:43 +0000 |
|---|---|---|
| committer | root <root@usrp1-e.lan> | 2010-05-05 21:12:43 +0000 |
| commit | 6929d0cba40a2bf4f4b3b81819bb915bdbb16488 (patch) | |
| tree | 3b2cae7169bd3629473a57294ac3fd119fba1ad8 /host/apps | |
| parent | 5583cb575e45441c98480f7beecb48437842fc5c (diff) | |
| download | uhd-6929d0cba40a2bf4f4b3b81819bb915bdbb16488.tar.gz uhd-6929d0cba40a2bf4f4b3b81819bb915bdbb16488.tar.bz2 uhd-6929d0cba40a2bf4f4b3b81819bb915bdbb16488.zip | |
Remove workaround for driver hang.
Diffstat (limited to 'host/apps')
| -rw-r--r-- | host/apps/omap_debug/usrp-e-i2c.c | 2 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp-e-spi.c | 2 | ||||
| -rw-r--r-- | host/apps/omap_debug/usrp_e.h | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/host/apps/omap_debug/usrp-e-i2c.c b/host/apps/omap_debug/usrp-e-i2c.c index 57a3f4739..615dc557b 100644 --- a/host/apps/omap_debug/usrp-e-i2c.c +++ b/host/apps/omap_debug/usrp-e-i2c.c @@ -38,8 +38,6 @@ int main(int argc, char *argv[]) fp = open("/dev/usrp_e0", O_RDWR); printf("fp = %d\n", fp); - sleep(1); - if (direction) { count = argc - 3; } else { diff --git a/host/apps/omap_debug/usrp-e-spi.c b/host/apps/omap_debug/usrp-e-spi.c index 2fcc39b9b..d2c38e524 100644 --- a/host/apps/omap_debug/usrp-e-spi.c +++ b/host/apps/omap_debug/usrp-e-spi.c @@ -29,8 +29,6 @@ int main(int argc, char *argv[]) fp = open("/dev/usrp_e0", O_RDWR); printf("fp = %d\n", fp); - sleep(1); // HACK HACK - spi_dat.slave = slave; spi_dat.data = data; spi_dat.length = length; diff --git a/host/apps/omap_debug/usrp_e.h b/host/apps/omap_debug/usrp_e.h index d4132021f..0b582f59b 100644 --- a/host/apps/omap_debug/usrp_e.h +++ b/host/apps/omap_debug/usrp_e.h @@ -66,8 +66,8 @@ struct usrp_e_i2c { #define USRP_E_READ_CTL16 _IOWR(USRP_E_IOC_MAGIC, 0x21, struct usrp_e_ctl16) #define USRP_E_WRITE_CTL32 _IOW(USRP_E_IOC_MAGIC, 0x22, struct usrp_e_ctl32) #define USRP_E_READ_CTL32 _IOWR(USRP_E_IOC_MAGIC, 0x23, struct usrp_e_ctl32) -#define USRP_E_SPI _IOW(USRP_E_IOC_MAGIC, 0x24, struct usrp_e_spi) -#define USRP_E_I2C_READ _IOR(USRP_E_IOC_MAGIC, 0x25, struct usrp_e_i2c) +#define USRP_E_SPI _IOWR(USRP_E_IOC_MAGIC, 0x24, struct usrp_e_spi) +#define USRP_E_I2C_READ _IOWR(USRP_E_IOC_MAGIC, 0x25, struct usrp_e_i2c) #define USRP_E_I2C_WRITE _IOW(USRP_E_IOC_MAGIC, 0x26, struct usrp_e_i2c) // Data transfer frame definition |