tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
firewire: Break out shared IEEE1394 constant to separate header file.
Signed-off-by: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
authored by
Kristian Høgsberg
and committed by
Stefan Richter
4c5a443e
04dfb8db
+74
-105
+1
-60
drivers/firewire/fw-transaction.h
+1
-60
drivers/firewire/fw-transaction.h
···
25
25
#include <linux/list.h>
26
26
#include <linux/fs.h>
27
27
#include <linux/dma-mapping.h>
28
-
29
-
#define TCODE_WRITE_QUADLET_REQUEST 0
30
-
#define TCODE_WRITE_BLOCK_REQUEST 1
31
-
#define TCODE_WRITE_RESPONSE 2
32
-
#define TCODE_READ_QUADLET_REQUEST 4
33
-
#define TCODE_READ_BLOCK_REQUEST 5
34
-
#define TCODE_READ_QUADLET_RESPONSE 6
35
-
#define TCODE_READ_BLOCK_RESPONSE 7
36
-
#define TCODE_CYCLE_START 8
37
-
#define TCODE_LOCK_REQUEST 9
38
-
#define TCODE_STREAM_DATA 10
39
-
#define TCODE_LOCK_RESPONSE 11
28
+
#include <linux/firewire-constants.h>
40
29
41
30
#define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4)
42
31
#define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0)
···
33
44
#define TCODE_IS_RESPONSE(tcode) (((tcode) & 2) != 0)
34
45
#define TCODE_HAS_REQUEST_DATA(tcode) (((tcode) & 12) != 4)
35
46
#define TCODE_HAS_RESPONSE_DATA(tcode) (((tcode) & 12) != 0)
36
-
37
-
/* Juju specific tcodes */
38
-
#define TCODE_DEALLOCATE 0x10
39
-
#define TCODE_LOCK_MASK_SWAP 0x11
40
-
#define TCODE_LOCK_COMPARE_SWAP 0x12
41
-
#define TCODE_LOCK_FETCH_ADD 0x13
42
-
#define TCODE_LOCK_LITTLE_ADD 0x14
43
-
#define TCODE_LOCK_BOUNDED_ADD 0x15
44
-
#define TCODE_LOCK_WRAP_ADD 0x16
45
-
#define TCODE_LOCK_VENDOR_SPECIFIC 0x17
46
-
47
-
#define SCODE_100 0x0
48
-
#define SCODE_200 0x1
49
-
#define SCODE_400 0x2
50
-
#define SCODE_BETA 0x3
51
-
52
-
#define EXTCODE_MASK_SWAP 0x1
53
-
#define EXTCODE_COMPARE_SWAP 0x2
54
-
#define EXTCODE_FETCH_ADD 0x3
55
-
#define EXTCODE_LITTLE_ADD 0x4
56
-
#define EXTCODE_BOUNDED_ADD 0x5
57
-
#define EXTCODE_WRAP_ADD 0x6
58
-
59
-
#define ACK_COMPLETE 0x1
60
-
#define ACK_PENDING 0x2
61
-
#define ACK_BUSY_X 0x4
62
-
#define ACK_BUSY_A 0x5
63
-
#define ACK_BUSY_B 0x6
64
-
#define ACK_DATA_ERROR 0xd
65
-
#define ACK_TYPE_ERROR 0xe
66
-
67
-
#define RCODE_COMPLETE 0x0
68
-
#define RCODE_CONFLICT_ERROR 0x4
69
-
#define RCODE_DATA_ERROR 0x5
70
-
#define RCODE_TYPE_ERROR 0x6
71
-
#define RCODE_ADDRESS_ERROR 0x7
72
-
73
-
/* Juju specific rcodes */
74
-
#define RCODE_SEND_ERROR 0x10
75
-
#define RCODE_CANCELLED 0x11
76
-
#define RCODE_BUSY 0x12
77
-
#define RCODE_GENERATION 0x13
78
-
#define RCODE_NO_ACK 0x14
79
-
80
-
#define RETRY_1 0x00
81
-
#define RETRY_X 0x01
82
-
#define RETRY_A 0x02
83
-
#define RETRY_B 0x03
84
47
85
48
#define LOCAL_BUS 0xffc0
86
49
+6
-45
include/linux/firewire-cdev.h
+6
-45
include/linux/firewire-cdev.h
···
1
-
/* -*- c-basic-offset: 8 -*-
2
-
*
3
-
* fw-device-cdev.h -- Char device interface.
1
+
/*
2
+
* Char device interface.
4
3
*
5
4
* Copyright (C) 2005-2006 Kristian Hoegsberg <krh@bitplanet.net>
6
5
*
···
18
19
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19
20
*/
20
21
21
-
#ifndef __fw_cdev_h
22
-
#define __fw_cdev_h
22
+
#ifndef _LINUX_FIREWIRE_CDEV_H
23
+
#define _LINUX_FIREWIRE_CDEV_H
23
24
24
25
#include <linux/ioctl.h>
25
26
#include <linux/types.h>
26
-
27
-
#define TCODE_WRITE_QUADLET_REQUEST 0
28
-
#define TCODE_WRITE_BLOCK_REQUEST 1
29
-
#define TCODE_WRITE_RESPONSE 2
30
-
#define TCODE_READ_QUADLET_REQUEST 4
31
-
#define TCODE_READ_BLOCK_REQUEST 5
32
-
#define TCODE_READ_QUADLET_RESPONSE 6
33
-
#define TCODE_READ_BLOCK_RESPONSE 7
34
-
#define TCODE_CYCLE_START 8
35
-
#define TCODE_LOCK_REQUEST 9
36
-
#define TCODE_STREAM_DATA 10
37
-
#define TCODE_LOCK_RESPONSE 11
38
-
39
-
#define TCODE_LOCK_MASK_SWAP 0x11
40
-
#define TCODE_LOCK_COMPARE_SWAP 0x12
41
-
#define TCODE_LOCK_FETCH_ADD 0x13
42
-
#define TCODE_LOCK_LITTLE_ADD 0x14
43
-
#define TCODE_LOCK_BOUNDED_ADD 0x15
44
-
#define TCODE_LOCK_WRAP_ADD 0x16
45
-
#define TCODE_LOCK_VENDOR_DEPENDENT 0x17
46
-
47
-
#define RCODE_COMPLETE 0x0
48
-
#define RCODE_CONFLICT_ERROR 0x4
49
-
#define RCODE_DATA_ERROR 0x5
50
-
#define RCODE_TYPE_ERROR 0x6
51
-
#define RCODE_ADDRESS_ERROR 0x7
52
-
53
-
#define RCODE_SEND_ERROR 0x10
54
-
#define RCODE_CANCELLED 0x11
55
-
#define RCODE_BUSY 0x12
56
-
#define RCODE_GENERATION 0x13
57
-
#define RCODE_NO_ACK 0x14
58
-
59
-
#define SCODE_100 0x0
60
-
#define SCODE_200 0x1
61
-
#define SCODE_400 0x2
62
-
#define SCODE_800 0x3
63
-
#define SCODE_1600 0x4
64
-
#define SCODE_3200 0x5
27
+
#include <linux/firewire-constants.h>
65
28
66
29
#define FW_CDEV_EVENT_BUS_RESET 0x00
67
30
#define FW_CDEV_EVENT_RESPONSE 0x01
···
226
265
__u32 handle;
227
266
};
228
267
229
-
#endif /* __fw_cdev_h */
268
+
#endif /* _LINUX_FIREWIRE_CDEV_H */
+67
include/linux/firewire-constants.h
+67
include/linux/firewire-constants.h
···
1
+
#ifndef _LINUX_FIREWIRE_CONSTANTS_H
2
+
#define _LINUX_FIREWIRE_CONSTANTS_H
3
+
4
+
#define TCODE_WRITE_QUADLET_REQUEST 0x0
5
+
#define TCODE_WRITE_BLOCK_REQUEST 0x1
6
+
#define TCODE_WRITE_RESPONSE 0x2
7
+
#define TCODE_READ_QUADLET_REQUEST 0x4
8
+
#define TCODE_READ_BLOCK_REQUEST 0x5
9
+
#define TCODE_READ_QUADLET_RESPONSE 0x6
10
+
#define TCODE_READ_BLOCK_RESPONSE 0x7
11
+
#define TCODE_CYCLE_START 0x8
12
+
#define TCODE_LOCK_REQUEST 0x9
13
+
#define TCODE_STREAM_DATA 0xa
14
+
#define TCODE_LOCK_RESPONSE 0xb
15
+
16
+
#define EXTCODE_MASK_SWAP 0x1
17
+
#define EXTCODE_COMPARE_SWAP 0x2
18
+
#define EXTCODE_FETCH_ADD 0x3
19
+
#define EXTCODE_LITTLE_ADD 0x4
20
+
#define EXTCODE_BOUNDED_ADD 0x5
21
+
#define EXTCODE_WRAP_ADD 0x6
22
+
#define EXTCODE_VENDOR_DEPENDENT 0x7
23
+
24
+
/* Juju specific tcodes */
25
+
#define TCODE_LOCK_MASK_SWAP (0x10 | EXTCODE_MASK_SWAP)
26
+
#define TCODE_LOCK_COMPARE_SWAP (0x10 | EXTCODE_COMPARE_SWAP)
27
+
#define TCODE_LOCK_FETCH_ADD (0x10 | EXTCODE_FETCH_ADD)
28
+
#define TCODE_LOCK_LITTLE_ADD (0x10 | EXTCODE_LITTLE_ADD)
29
+
#define TCODE_LOCK_BOUNDED_ADD (0x10 | EXTCODE_BOUNDED_ADD)
30
+
#define TCODE_LOCK_WRAP_ADD (0x10 | EXTCODE_WRAP_ADD)
31
+
#define TCODE_LOCK_VENDOR_DEPENDENT (0x10 | EXTCODE_VENDOR_DEPENDENT)
32
+
33
+
#define RCODE_COMPLETE 0x0
34
+
#define RCODE_CONFLICT_ERROR 0x4
35
+
#define RCODE_DATA_ERROR 0x5
36
+
#define RCODE_TYPE_ERROR 0x6
37
+
#define RCODE_ADDRESS_ERROR 0x7
38
+
39
+
/* Juju specific rcodes */
40
+
#define RCODE_SEND_ERROR 0x10
41
+
#define RCODE_CANCELLED 0x11
42
+
#define RCODE_BUSY 0x12
43
+
#define RCODE_GENERATION 0x13
44
+
#define RCODE_NO_ACK 0x14
45
+
46
+
#define SCODE_100 0x0
47
+
#define SCODE_200 0x1
48
+
#define SCODE_400 0x2
49
+
#define SCODE_800 0x3
50
+
#define SCODE_1600 0x4
51
+
#define SCODE_3200 0x5
52
+
#define SCODE_BETA 0x3
53
+
54
+
#define ACK_COMPLETE 0x1
55
+
#define ACK_PENDING 0x2
56
+
#define ACK_BUSY_X 0x4
57
+
#define ACK_BUSY_A 0x5
58
+
#define ACK_BUSY_B 0x6
59
+
#define ACK_DATA_ERROR 0xd
60
+
#define ACK_TYPE_ERROR 0xe
61
+
62
+
#define RETRY_1 0x00
63
+
#define RETRY_X 0x01
64
+
#define RETRY_A 0x02
65
+
#define RETRY_B 0x03
66
+
67
+
#endif /* _LINUX_FIREWIRE_CONSTANTS_H */