i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch from JiSheng which fixes firewire build warnings and fix atomic_set_int to use atomic_or

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25181 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-04-26 15:02:43 +00:00
parent d7f85ef122
commit 66cb27d82e
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/firewire/firewirereg.h
+8 -2
View File
@@ -340,7 +340,7 @@ struct fw_rcv_buf {
u_int nvec;
uint8_t spd;
};
//#ifndef __HAIKU__
void fw_sidrcv (struct firewire_comm *, uint32_t *, u_int);
void fw_rcv (struct fw_rcv_buf *);
void fw_xfer_unload ( struct fw_xfer*);
@@ -372,7 +372,7 @@ void fw_drain_txq (struct firewire_comm *);
//int fwdev_destroydev (struct firewire_softc *);
//void fwdev_clone (void *, struct ucred *, char *, int, struct cdev **);
int fw_open_isodma(struct firewire_comm *, int);
//#endif
extern int firewire_debug;
#ifndef __HAIKU__
extern devclass_t firewire_devclass;
@@ -414,5 +414,11 @@ extern int firewire_phydma_enable;
MALLOC_DECLARE(M_FW);
MALLOC_DECLARE(M_FWXFER);
#endif /*__HAIKU__*/
#ifdef __HAIKU__
int firewire_attach(struct firewire_comm *fc, struct firewire_softc *sc);
void firewire_detach(struct firewire_softc *sc);
status_t fwohci_pci_attach(int index);
status_t fwohci_pci_detach(int index);
#endif
#endif
headers/private/firewire/fwglue.h
+2 -2
View File
@@ -30,8 +30,8 @@
typedef uint32_t bus_addr_t;
typedef uint32_t bus_size_t;
#define atomic_readandclear_int(a) atomic_set(a, 0)
#define atomic_set_int(addr, newvalue) atomic_set(addr, newvalue)
#define atomic_readandclear_int(ptr) atomic_set((int32 *)(ptr), 0)
#define atomic_set_int(ptr, value) atomic_or((int32 *)(ptr), value)
#define mtx_lock benaphore_lock
#define mtx_unlock benaphore_unlock