1 --- dsme-0.60.4+0m5/dsme-cal.c
2 +++ dsme-0.60.4+0m5/dsme-cal.c
4 #include "dsme/dsme-cal.h"
5 #include "dsme/logging.h"
10 static void dsme_cal_debug(int level, const char *str);
11 static void dsme_cal_error(const char *str);
15 int dsme_cal_init(void) {
17 - cal_debug_log = dsme_cal_debug;
18 +/* cal_debug_log = dsme_cal_debug;
19 cal_error_log = dsme_cal_error;
27 dsme_log(LOG_ERR, "CAL ERROR: %s", str);
30 --- dsme-0.60.4+0m5/Makefile
31 +++ dsme-0.60.4+0m5/Makefile
33 # C_DBGFLAGS are not used for normal builds
35 C_GENFLAGS := -DPRG_VERSION=$(VERSION) -g \
36 - -Wall -Wwrite-strings -Wmissing-prototypes -Werror# -pedantic
37 + -Wall -Wwrite-strings -Wmissing-prototypes -D_GNU_SOURCE # -pedantic
39 C_DBGFLAGS := -g -DDEBUG -DDSME_LOG_ENABLE
40 -C_DEFINES := DSME_POSIX_TIMER DSME_WD_SYNC DSME_BMEIPC
41 +C_DEFINES := DSME_POSIX_TIMER DSME_WD_SYNC
42 C_INCDIRS := $(TOPDIR)/include $(TOPDIR)/modules $(TOPDIR)
43 MKDEP_INCFLAGS := $$(pkg-config --cflags-only-I glib-2.0)
46 logging.o oom.o mainloop.o \
51 dsme: LD_EXTRA_GENFLAGS := -rdynamic
53 #logging.o: C_EXTRA_DEFINES := USE_STDERR
54 --- dsme-0.60.4+0m5/util/kicker.c
55 +++ dsme-0.60.4+0m5/util/kicker.c
60 - ret = cal_read_block(kicker_cal, "r&d_mode", &vptr, &len, CAL_FLAG_USER);
61 + ret = cal_read_block(kicker_cal, "r&d_mode", &vptr, &len, 0);
63 fprintf(stderr, "Kicker: error reading R&D mode flags, watchdog enabled\n");
64 cal_finish(kicker_cal);
65 --- dsme-0.60.4+0m5/util/Makefile
66 +++ dsme-0.60.4+0m5/util/Makefile
68 waitfordsme_SO_LIBS := dsme
69 kicker_C_OBJS := kicker.o
70 kicker_SO_LIBS := dsme
73 thermaltool_C_OBJS := thermaltool.o
74 -thermaltool_LIBS := cal
78 # Install files in this directory
79 --- dsme-0.60.4+0m5/debian/control
80 +++ dsme-0.60.4+0m5/debian/control
83 Maintainer: Semi Malinen <semi.malinen@nokia.com>
84 Uploaders: Ismo Laitinen <ismo.laitinen@nokia.com>, David Weinehall <david.weinehall@nokia.com>, Philippe De Swert <philippe.de-swert@nokia.com>
85 -Build-Depends: debhelper (>= 4.1.0), libbmeipc-dev, libcal-dev (>= 0.2.0), pkg-config, libglib2.0-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev, upstart-dev
86 +Build-Depends: debhelper (>= 4.1.0), pkg-config, libglib2.0-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev, upstart-dev
87 Standards-Version: 3.7.2
90 --- dsme-0.60.4+0m5/debian/changelog
91 +++ dsme-0.60.4+0m5/debian/changelog
93 +dsme (0.60.4+0m5-mer1) jaunty; urgency=low
95 + * Make it compile under Mer.
97 + -- Carsten V. Munk <cvm@cs.au.dk> Wed, 27 May 2009 16:27:10 +0000
99 dsme (0.60.4+0m5) unstable; urgency=low
101 * This entry has been added by BIFH queue processor
102 --- dsme-0.60.4+0m5/include/cal.h
103 +++ dsme-0.60.4+0m5/include/cal.h
110 +static void cal_debug(int a, const char *b) {}
111 +static void cal_error(const char *a) {}
112 +static void cal_finish(struct cal *a) {}
113 +static int cal_init(struct cal **a) { return -1; }
114 +static int cal_lock_otp_area(struct cal *a, unsigned int b) { return -1; }
115 +static int cal_read_block(struct cal *a, const char *b, void **c, long unsigned int *d, long unsigned int e) { return -1; };
116 +static int cal_write_block(struct cal *a, const char *b, const void *c, long unsigned int d, long unsigned int e) { return -1; };
118 +#define CAL_FLAG_USER 0