uaa

NetBSD 6.1 w/T-SH7706LSR ssumci.c mod take 2

uaa
Aug 7th, 2013
151
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Index: ssumci.c
  2. ===================================================================
  3. RCS file: /cvsroot/src/sys/arch/evbsh3/t_sh7706lan/ssumci.c,v
  4. retrieving revision 1.2
  5. diff -u -r1.2 ssumci.c
  6. --- ssumci.c 21 Jan 2012 19:44:29 -0000 1.2
  7. +++ ssumci.c 8 Aug 2013 04:17:45 -0000
  8. @@ -137,21 +137,9 @@
  9. _reg_write_2((reg), _r); \
  10. } while (/*CONSTCOND*/0)
  11.  
  12. -#define SCPCR_CLK_MASK 0x000C
  13. -#define SCPCR_CLK_IN 0x000C
  14. -#define SCPCR_CLK_OUT 0x0004
  15. -#define SCPDR_CLK 0x02
  16. -#define SCPCR_DAT_MASK 0x0003
  17. -#define SCPCR_DAT_IN 0x0003
  18. -#define SCPCR_DAT_OUT 0x0001
  19. -#define SCPDR_DAT 0x01
  20. -#define SCPCR_CMD_MASK 0x0030
  21. -#define SCPCR_CMD_IN 0x0030
  22. -#define SCPCR_CMD_OUT 0x0010
  23. -#define SCPDR_CMD 0x04
  24. #define SCPCR_CS_MASK 0x000C
  25. #define SCPCR_CS_OUT 0x0004
  26. -#define SCPDR_CS 0x08
  27. +#define SCPDR_CS 0x02
  28. #define SCPCR_EJECT 0x00C0
  29. #define SCPDR_EJECT 0x08
  30.  
  31. @@ -381,7 +369,7 @@
  32. break;
  33. }
  34. if (timo == 0) {
  35. - DPRINTF(1,(sc->sc_dev, "response timeout\n"));
  36. + aprint_error_dev(sc->sc_dev, "response timeout\n");
  37. cmd->c_error = ETIMEDOUT;
  38. goto out;
  39. }
RAW Paste Data