Part of Slepp's Projects — Pastebin — TURL — Imagebin — Filebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate

Paste Actions

Download Raw
Embed
Post to Twitter
Remove Paste

Paste Details

Raw format, 9 years 9 months old.

Advertising

Someone
Monday, April 14th, 2008 at 6:40:13pm UTC 

  1. diff -u nut-2.2.1/debian/changelog nut-2.2.1/debian/changelog
  2. --- nut-2.2.1/debian/changelog
  3. +++ nut-2.2.1/debian/changelog
  4. @@ -1,3 +1,10 @@
  5. +nut (2.2.1-2.1ubuntu7) hardy; urgency=low
  6. +
  7. +  * debian/patches/01_fix_megatec_regression.dpatch
  8. +    - Fix more megatec_usb driver regressions. (LP: #215389)
  9. +
  10. + -- Chuck Short <[email protected]>  Mon, 14 Apr 2008 14:25:48 -0400
  11. +
  12.  nut (2.2.1-2.1ubuntu6) hardy; urgency=low
  13.  
  14.    * debian/patches/01_fix_megatec_regression.dpatch
  15. diff -u nut-2.2.1/debian/patches/01_fix_megatec_regression.dpatch nut-2.2.1/debian/patches/01_fix_megatec_regression.dpatch
  16. --- nut-2.2.1/debian/patches/01_fix_megatec_regression.dpatch
  17. +++ nut-2.2.1/debian/patches/01_fix_megatec_regression.dpatch
  18. @@ -3,7 +3,7 @@
  19.  @[email protected]
  20.  diff -Naur nut-2.2.1.orig/data/driver.list nut-2.2.1/data/driver.list
  21.  --- nut-2.2.1.orig/data/driver.list    2007-12-17 09:45:44.000000000 -0500
  22. -+++ nut-2.2.1/data/driver.list 2008-04-10 09:30:39.000000000 -0400
  23. ++++ nut-2.2.1/data/driver.list 2008-04-14 14:28:59.000000000 -0400
  24.  @@ -54,6 +54,7 @@
  25.  
  26.   "APC" "(various)"      "SNMP monitoring card"        "snmp-ups (experimental driver)"
  27. @@ -59,7 +59,7 @@
  28.   "Various"     "(various)"  "Generic RUPS model"      "genericups upstype=4"
  29.  diff -Naur nut-2.2.1.orig/drivers/megatec.c nut-2.2.1/drivers/megatec.c
  30.  --- nut-2.2.1.orig/drivers/megatec.c   2007-12-17 10:13:09.000000000 -0500
  31. -+++ nut-2.2.1/drivers/megatec.c        2008-04-10 09:25:10.000000000 -0400
  32. ++++ nut-2.2.1/drivers/megatec.c        2008-04-14 14:28:59.000000000 -0400
  33.  @@ -61,6 +61,8 @@
  34.   #define MAX_START_DELAY_LEN    4
  35.   #define MAX_SHUTDOWN_DELAY_LEN 2
  36. @@ -122,7 +122,7 @@
  37.         dstate_setinfo("output.voltage", "%.1f", query.ovolt);
  38.  diff -Naur nut-2.2.1.orig/drivers/megatec.h nut-2.2.1/drivers/megatec.h
  39.  --- nut-2.2.1.orig/drivers/megatec.h   2007-12-17 10:13:09.000000000 -0500
  40. -+++ nut-2.2.1/drivers/megatec.h        2008-04-10 09:25:54.000000000 -0400
  41. ++++ nut-2.2.1/drivers/megatec.h        2008-04-14 14:28:59.000000000 -0400
  42.  @@ -26,7 +26,7 @@
  43.   #define MEGATEC_H
  44.  
  45. @@ -134,7 +134,7 @@
  46.   #ifdef MEGATEC_SUBDRV
  47.  diff -Naur nut-2.2.1.orig/drivers/megatec_usb.c nut-2.2.1/drivers/megatec_usb.c
  48.  --- nut-2.2.1.orig/drivers/megatec_usb.c       2007-10-01 09:06:24.000000000 -0400
  49. -+++ nut-2.2.1/drivers/megatec_usb.c    2008-04-10 09:51:59.000000000 -0400
  50. ++++ nut-2.2.1/drivers/megatec_usb.c    2008-04-14 14:29:03.000000000 -0400
  51.  @@ -46,6 +46,8 @@
  52.   static usb_communication_subdriver_t *usb = &usb_subdriver;
  53.   static usb_dev_handle *udev = NULL;
  54. @@ -161,28 +161,42 @@
  55.   /* agiler subdriver definition */
  56.   static int get_data_agiler(char *buffer, int buffer_size);
  57.   static int set_data_agiler(const char *str);
  58. [email protected]@ -75,6 +87,7 @@
  59. [email protected]@ -63,6 +75,16 @@
  60. +       set_data_agiler
  61. + };
  62. +
  63. ++/* Phoenixtec Power Co subdriver definition */
  64. ++static int get_data_phoenix(char *buffer, int buffer_size);
  65. ++static int set_data_phoenix(const char *str);
  66. ++
  67. ++static subdriver_t phoenix_subdriver = {
  68. ++      "phoenix",
  69. ++      get_data_phoenix,
  70. ++      set_data_phoenix
  71. ++};
  72. ++
  73. + /* krauler (ablerex) subdriver definition */
  74. + static int get_data_krauler(char *buffer, int buffer_size);
  75. + static int set_data_krauler(const char *str);
  76. [email protected]@ -75,8 +97,10 @@
  77.  
  78.   /* list of subdrivers */
  79.   static subdriver_t *subdriver_list[] = {
  80.  +      &agiler_old_subdriver,
  81.         &agiler_subdriver,
  82.         &krauler_subdriver,
  83. ++      &phoenix_subdriver,
  84.         NULL  /* end of list */
  85. [email protected]@ -91,14 +104,16 @@
  86. + };
  87.  
  88. - /* list of all known devices */
  89. - static usb_ups_t KnownDevices[] = {
  90. --      {0x05b8, 0x0000, &agiler_subdriver},  /* Agiler UPS */
  91. --      {0x0001, 0x0000, &krauler_subdriver}, /* Krauler UP-M500VA */
  92. --      {0xffff, 0x0000, &krauler_subdriver}, /* Ablerex 625L USB */
  93. [email protected]@ -94,11 +118,13 @@
  94. +       {0x05b8, 0x0000, &agiler_subdriver},  /* Agiler UPS */
  95. +       {0x0001, 0x0000, &krauler_subdriver}, /* Krauler UP-M500VA */
  96. +       {0xffff, 0x0000, &krauler_subdriver}, /* Ablerex 625L USB */
  97.  -      {0x0665, 0x5161, &agiler_subdriver},  /* Belkin F6C1200-UNV */
  98. -+      {0x05b8, 0x0000, &agiler_old_subdriver},      /* Agiler UPS */
  99. -+      {0x0001, 0x0000, &krauler_subdriver},  /* Krauler UP-M500VA */
  100. -+      {0xffff, 0x0000, &krauler_subdriver},  /* Ablerex 625L USB */
  101. -+      {0x0665, 0x5161, &agiler_old_subdriver},      /* Belkin F6C1200-UNV */
  102. -+      {0x06da, 0x0003, &agiler_old_subdriver},      /* Mustek Powermust */
  103. -+      {0x0f03, 0x0001, &agiler_old_subdriver},      /* Unitek Alpha 1200Sx */
  104. ++      {0x0665, 0x5161, &phoenix_subdriver}, /* Belkin F6C1200-UNV */
  105. ++      {0x06da, 0x0003, &phoenix_subdriver}, /* Mustek Powermust */
  106. ++      {0x0f03, 0x0001, &phoenix_subdriver}, /* Unitek Alpha 1200Sx */
  107.         {-1, -1, NULL}                /* end of list */
  108.   };
  109.  
  110. @@ -191,7 +205,7 @@
  111.   {
  112.         usb_ups_t *p;
  113.  
  114. [email protected]@ -115,6 +130,12 @@
  115. [email protected]@ -115,6 +141,12 @@
  116.         return 0;
  117.   }
  118.  
  119. @@ -204,7 +218,7 @@
  120.   static void usb_open_error(const char *port)
  121.   {
  122.         fatalx(EXIT_FAILURE,
  123. [email protected]@ -148,13 +169,8 @@
  124. [email protected]@ -148,13 +180,8 @@
  125.  
  126.   int ser_open(const char *port)
  127.   {
  128. @@ -219,7 +233,7 @@
  129.  
  130.         char *subdrv = getval("subdriver");
  131.         char *vid = getval("vendorid");
  132. [email protected]@ -162,6 +178,7 @@
  133. [email protected]@ -162,6 +189,7 @@
  134.         char *vend = getval("vendor");
  135.         char *prod = getval("product");
  136.  
  137. @@ -227,7 +241,7 @@
  138.         if(subdrv)
  139.         {
  140.               subdriver_t **p;
  141. [email protected]@ -186,9 +203,6 @@
  142. [email protected]@ -186,9 +214,6 @@
  143.                     fatalx(EXIT_FAILURE, "No subdrivers named \"%s\" found!", subdrv);
  144.         }
  145.  
  146. @@ -237,7 +251,7 @@
  147.         /* FIXME: fix "serial" variable */
  148.           /* process the UPS selection options */
  149.         regex_array[0] = vid;
  150. [email protected]@ -198,11 +212,11 @@
  151. [email protected]@ -198,11 +223,11 @@
  152.         regex_array[4] = NULL; /* getval("serial"); */
  153.         regex_array[5] = getval("bus");
  154.  
  155. @@ -253,7 +267,7 @@
  156.         }
  157.         /* link the matchers */
  158.         regex_matcher->next = &subdriver_matcher;
  159. [email protected]@ -211,12 +225,28 @@
  160. [email protected]@ -211,12 +236,28 @@
  161.         if (ret < 0)
  162.               usb_open_error(port);
  163.  
  164. @@ -266,10 +280,10 @@
  165.  +      }
  166.  +      /* link the matchers */
  167.  +      reopen_matcher->next = regex_matcher;
  168. -
  169. ++
  170.  +      /* NOTE: This is here until ser_flush_io() is used in megatec.c */
  171.  +      ser_flush_io(0);
  172. -+
  173. +
  174.  +      return 0;
  175.  +}
  176.  +
  177. @@ -285,7 +299,7 @@
  178.                     break;
  179.         }
  180.  
  181. [email protected]@ -235,22 +265,90 @@
  182. [email protected]@ -235,22 +276,90 @@
  183.  
  184.   int ser_set_rts(int fd, int state)
  185.   {
  186. @@ -377,7 +391,7 @@
  187.               return -1;
  188.  
  189.         va_start(ap, fmt);
  190. [email protected]@ -264,7 +362,12 @@
  191. [email protected]@ -264,7 +373,12 @@
  192.               buf[sizeof(buf) - 1] = 0;
  193.         }
  194.  
  195. @@ -391,7 +405,7 @@
  196.   }
  197.  
  198.   int ser_get_line(int fd, char *buf, size_t buflen, char endchar, const char *ignset, long d_sec, long d_usec)
  199. [email protected]@ -272,16 +375,18 @@
  200. [email protected]@ -272,16 +386,18 @@
  201.         int len;
  202.         char *src, *dst, c;
  203.  
  204. @@ -415,7 +429,7 @@
  205.               c = *src;
  206.  
  207.               if (c == endchar)
  208. [email protected]@ -294,25 +399,77 @@
  209. [email protected]@ -294,25 +410,77 @@
  210.         }
  211.  
  212.         /* terminate string if we have space */
  213. @@ -499,7 +513,70 @@
  214.   static int set_data_agiler(const char *str)
  215.   {
  216.         return usb->set_report(udev, 0, (unsigned char *)str, strlen(str));
  217. [email protected]@ -337,87 +494,95 @@
  218. [email protected]@ -325,6 +493,62 @@
  219. +
  220. +
  221. + /*
  222. ++    Phoenixtec Power Co serial-to-usb device.
  223. ++*/
  224. ++static char   phoenix_buffer[32];
  225. ++
  226. ++static int set_data_phoenix(const char *str)
  227. ++{
  228. ++      unsigned int  count;
  229. ++
  230. ++      memset(phoenix_buffer, '\0', sizeof(phoenix_buffer));
  231. ++
  232. ++      snprintf(phoenix_buffer, sizeof(phoenix_buffer), "%s", str);
  233. ++
  234. ++      if (!strcmp(phoenix_buffer, "I\r") || !strcmp(phoenix_buffer, "C\r")) {
  235. ++            /* Ignore these, since they seem to lock up the connection */
  236. ++            return strlen(phoenix_buffer);
  237. ++      }
  238. ++
  239. ++      for (count = 0; count < strlen(phoenix_buffer); count += 8) {
  240. ++
  241. ++            if (usb->set_report(udev, 0, (unsigned char *)(phoenix_buffer + count), 8) < 1) {
  242. ++                  return -1;
  243. ++            }
  244. ++      }
  245. ++
  246. ++      return strlen(phoenix_buffer);
  247. ++}
  248. ++
  249. ++static int get_data_phoenix(char *buffer, int buffer_size)
  250. ++{
  251. ++      int   count;
  252. ++
  253. ++      memset(buffer, '\0', buffer_size);
  254. ++
  255. ++      if (!strcmp(phoenix_buffer, "I\r") || !strcmp(phoenix_buffer, "C\r")) {
  256. ++            /* Echo back unsupported commands */
  257. ++            snprintf(buffer, buffer_size, "%s", phoenix_buffer);
  258. ++            return strlen(buffer);
  259. ++      }
  260. ++
  261. ++      for (count = 8; count <= buffer_size; count += 8) {
  262. ++
  263. ++            /* Read data in 8-byte chunks, break on a timeout */
  264. ++            if (usb->get_interrupt(udev, (unsigned char *)&buffer[count-8], 8, 1000) < 0) {
  265. ++                  return count-8;
  266. ++            }
  267. ++
  268. ++            upsdebugx(3, "get_data_phoenix: got so far [%s]", buffer);
  269. ++            upsdebug_hex(4, "get_data_phoenix", (unsigned char *)buffer, count);
  270. ++      }
  271. ++
  272. ++      upsdebugx(3, "get_data_phoenix: buffer too small");
  273. ++      return -1;
  274. ++}
  275. ++
  276. ++
  277. ++/*
  278. +     Krauler serial-over-usb device.
  279. +
  280. +     Protocol was reverse-engineered using Windows driver.
  281. [email protected]@ -337,87 +561,95 @@
  282.   typedef struct {
  283.         char  *str;     /* Megatec command */
  284.         int   index;     /* Krauler string index for this command */
  285. @@ -577,10 +654,10 @@
  286.  +                        return res;
  287.                     }
  288.  -            }
  289. -
  290. +-
  291.  -            return strlen(str);
  292.  -      }
  293. --
  294. +
  295.  -      upsdebugx(4, "set_data_krauler: unknown command [%s]", str);
  296.  -      return 0;
  297.  -}
  298. @@ -651,7 +728,7 @@
  299.   }
  300.  diff -Naur nut-2.2.1.orig/scripts/hal/20-ups-nut-device.fdi nut-2.2.1/scripts/hal/20-ups-nut-device.fdi
  301.  --- nut-2.2.1.orig/scripts/hal/20-ups-nut-device.fdi   2007-10-01 08:59:22.000000000 -0400
  302. -+++ nut-2.2.1/scripts/hal/20-ups-nut-device.fdi        2008-04-10 09:31:09.000000000 -0400
  303. ++++ nut-2.2.1/scripts/hal/20-ups-nut-device.fdi        2008-04-14 14:28:59.000000000 -0400
  304.  @@ -162,6 +162,14 @@
  305.             <merge key="battery.type" type="string">ups</merge>
  306.           </match>
  307. @@ -692,7 +769,7 @@
  308.             <merge key="info.addons" type="strlist">hald-addon-megatec_usb</merge>
  309.  diff -Naur nut-2.2.1.orig/scripts/udev/nut-usbups.rules.in nut-2.2.1/scripts/udev/nut-usbups.rules.in
  310.  --- nut-2.2.1.orig/scripts/udev/nut-usbups.rules.in    2007-10-15 07:16:52.000000000 -0400
  311. -+++ nut-2.2.1/scripts/udev/nut-usbups.rules.in 2008-04-10 09:32:14.000000000 -0400
  312. ++++ nut-2.2.1/scripts/udev/nut-usbups.rules.in 2008-04-14 14:28:59.000000000 -0400
  313.  @@ -24,7 +24,7 @@
  314.   # LIEBERT/PowerSure Personal XT
  315.   SYSFS{idVendor}=="06da", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@[email protected]"

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right