IEEE 802.15.4 subsystem
Sign in or create your account | Project List | Help
IEEE 802.15.4 subsystem Commit Details
Date: | 2010-09-06 01:51:07 (13 years 6 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | bb65155eabbf25005b71e2addf37457819a9e6cc |
Message: | Further cleanup to make the tools build for the "ben"
target. - tools/Makefile.common: set CC to the target-specific compiler - tools/atspi-id/atspi-id.c: exclude everything USB if HAVE_USB is not set - tools/atspi-id/atspi-id.c (atspi_usb_handle): rearrange to use a "struct atspi_dsc *" argument, so that we don't expose an USB dependency - tools/lib/Makefile: $(F32XBASE)/lib/usb.o is target-specific. Moved it from OBJS to OBJS_host. - tools/lib/Makefile (clean): remove objects of all targets |
Files: |
tools/Makefile.common (1 diff) tools/atspi-id/atspi-id.c (3 diffs) tools/lib/Makefile (2 diffs) |
Change Details
tools/Makefile.common | ||
---|---|---|
27 | 27 | MACROS_host = -DHAVE_USB |
28 | 28 | MACROS_ben = -DHAVE_USD |
29 | 29 | |
30 | CC = $(CC_$(TARGET)) | |
30 | 31 | CFLAGS += -I../../atrf/fw/include -I../include $(MACROS_$(TARGET)) |
31 | 32 | LDLIBS = $(LDLIBS_$(TARGET)) -L../lib -latspi |
tools/atspi-id/atspi-id.c | ||
---|---|---|
13 | 13 | |
14 | 14 | #include <stdlib.h> |
15 | 15 | #include <stdio.h> |
16 | ||
17 | #ifdef HAVE_USB | |
16 | 18 | #include <usb.h> |
19 | #endif | |
17 | 20 | |
18 | 21 | #include "at86rf230.h" |
19 | 22 | #include "atspi/ep0.h" |
20 | 23 | #include "atspi.h" |
21 | 24 | |
22 | 25 | |
26 | #ifdef HAVE_USB | |
27 | ||
23 | 28 | #define FROM_DEV ATSPI_FROM_DEV(0) |
24 | 29 | |
25 | 30 | #define BUF_SIZE 256 |
26 | 31 | |
27 | 32 | |
28 | ||
29 | 33 | static int get_id(usb_dev_handle *dev, void *data, int size) |
30 | 34 | { |
31 | 35 | int res; |
... | ... | |
67 | 71 | } |
68 | 72 | |
69 | 73 | |
70 | static void show_usb_info(usb_dev_handle *dev) | |
74 | static void show_usb_info(struct atspi_dsc *dsc) | |
71 | 75 | { |
72 | const struct usb_device *device = usb_device(dev); | |
76 | usb_dev_handle *dev; | |
77 | const struct usb_device *device; | |
73 | 78 | uint8_t major, minor, target; |
74 | 79 | char buf[BUF_SIZE+1]; /* +1 for terminating \0 */ |
75 | 80 | int len; |
76 | 81 | |
82 | dev = atspi_usb_handle(dsc); | |
83 | if (!dev) | |
84 | return; | |
85 | device = usb_device(dev); | |
86 | ||
77 | 87 | printf("%04x:%04x ", |
78 | 88 | device->descriptor.idVendor, device->descriptor.idProduct); |
79 | 89 | |
... | ... | |
89 | 99 | } |
90 | 100 | |
91 | 101 | |
102 | #else /* HAVE_USB */ | |
103 | ||
104 | ||
105 | static void show_usb_info(struct atspi_dsc *dsc) | |
106 | { | |
107 | } | |
108 | ||
109 | ||
110 | #endif /* !HAVE_USB */ | |
111 | ||
112 | ||
92 | 113 | static void show_info(struct atspi_dsc *dsc) |
93 | 114 | { |
94 | usb_dev_handle *dev; | |
95 | 115 | uint8_t part, version, man_id_0, man_id_1; |
96 | 116 | |
97 | dev = atspi_usb_handle(dsc); | |
98 | if (dev) | |
99 | show_usb_info(dev); | |
117 | show_usb_info(dsc); | |
100 | 118 | |
101 | 119 | part = atspi_reg_read(dsc, REG_PART_NUM); |
102 | 120 | version = atspi_reg_read(dsc, REG_VERSION_NUM); |
tools/lib/Makefile | ||
---|---|---|
16 | 16 | include ../Makefile.common |
17 | 17 | |
18 | 18 | CFLAGS += -Wall -I$(F32XBASE)/include |
19 | OBJS_host = atusb.o | |
19 | OBJS_host = atusb.o $(F32XBASE)/lib/usb.o | |
20 | 20 | OBJS_ben = atusd.o |
21 | OBJS = $(F32XBASE)/lib/usb.o atspi.o $(OBJS_$(TARGET)) | |
21 | OBJS = atspi.o $(OBJS_$(TARGET)) | |
22 | 22 | |
23 | 23 | .PHONY: all clean spotless |
24 | 24 | |
... | ... | |
28 | 28 | $(AR) cr $@ $^ |
29 | 29 | |
30 | 30 | clean: |
31 | rm -f $(OBJS) | |
31 | rm -f $(OBJS) $(OBJS_ben) $(OBJS_host) | |
32 | 32 | |
33 | 33 | spotless: clean |
34 | 34 | rm -f $(LIB) |