Bug#374721: toshset: FTBFS with pciutils 2.2

[Matej Vela]

retitle 374721 toshset: FTBFS with pciutils 2.2
tag 374721 patch
thanks

The build failure is caused by a change in pciutils 2.2.0:

        * lib/types.h, lib/pci.h, lib/sysdep.h: `byte' and `word' are
        no longer exported to the outside world.

The attached patch replaces `byte' with `u8' (which works with older
versions of pciutils as well).

Thanks,

Matej

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_toshsat1800-irdasetup_types.dpatch by Matej Vela <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: pciutils 2.2.0 and later no longer exports `byte'; use `u8' instead
## DP: (backwards-compatible).

@DPATCH@
diff -urNad toshset-1.71~/toshsat1800-irdasetup-0.2/toshsat1800-irdasetup.c 
toshset-1.71/toshsat1800-irdasetup-0.2/toshsat1800-irdasetup.c
--- toshset-1.71~/toshsat1800-irdasetup-0.2/toshsat1800-irdasetup.c     
2006-06-28 15:52:43.000000000 +0200
+++ toshset-1.71/toshsat1800-irdasetup-0.2/toshsat1800-irdasetup.c      
2006-06-28 15:53:17.000000000 +0200
@@ -68,8 +68,8 @@
 struct port_decoding_access_info
 {
        int             port;
-       byte    reg;
-       byte    or_mask;
+       u8      reg;
+       u8      or_mask;
 };
 
 struct port_decoding_access_info ali1533_ports[]=
@@ -116,7 +116,7 @@
 struct smc_chip_model
 {
        char *name;
-       byte  version_id;
+       u8  version_id;
        int  (*config_function)(int revision, int cfgbase, int sirbase, int 
firbase, int dma, int irq);
 };
 
@@ -275,7 +275,7 @@
 print_ali1533_port_status(struct pci_dev *dev)
 {
        struct port_decoding_access_info *p;
-       byte onebyte;
+       u8 onebyte;
        int i;
        
        DEBUG("printing port status");
@@ -302,7 +302,7 @@
 set_ali1533_port(struct pci_dev *dev, int port, int decode)
 {
        struct port_decoding_access_info info;
-       byte previousval, onebyte, and_mask;
+       u8 previousval, onebyte, and_mask;
        int retval;
        
        DEBUG_VAL("looking for port", port);
@@ -364,7 +364,7 @@
        struct pci_filter filter;
        int  ports[2], port_previous_mode, i;
        char *val;
-       byte byte;
+       u8 byte;
        
        access = pci_alloc();
        if(access==NULL)
@@ -452,7 +452,7 @@
 static int
 configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, 
int dma, int irq)
 {
-       byte onebyte;
+       u8 onebyte;
        int retval;
        
        DEBUG_VAL("trying to init SMC with cfgbase", cfgbase);
@@ -558,7 +558,7 @@
 static int
 configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq)
 {
-       byte version_id, revision_id, onebyte;
+       u8 version_id, revision_id, onebyte;
        struct smc_chip_model *chip_model;
        void *config_function;
        int retval;