ki2c.c revision 1.20 1 1.20 macallan /* $NetBSD: ki2c.c,v 1.20 2017/09/05 17:21:09 macallan Exp $ */
2 1.1 grant /* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
3 1.1 grant
4 1.1 grant /*-
5 1.1 grant * Copyright (c) 2001 Tsubai Masanari. All rights reserved.
6 1.1 grant *
7 1.1 grant * Redistribution and use in source and binary forms, with or without
8 1.1 grant * modification, are permitted provided that the following conditions
9 1.1 grant * are met:
10 1.1 grant * 1. Redistributions of source code must retain the above copyright
11 1.1 grant * notice, this list of conditions and the following disclaimer.
12 1.1 grant * 2. Redistributions in binary form must reproduce the above copyright
13 1.1 grant * notice, this list of conditions and the following disclaimer in the
14 1.1 grant * documentation and/or other materials provided with the distribution.
15 1.1 grant * 3. The name of the author may not be used to endorse or promote products
16 1.1 grant * derived from this software without specific prior written permission.
17 1.1 grant *
18 1.1 grant * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19 1.1 grant * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20 1.1 grant * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21 1.1 grant * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22 1.1 grant * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23 1.1 grant * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 1.1 grant * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 1.1 grant * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 1.1 grant * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 1.1 grant * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 1.1 grant */
29 1.1 grant
30 1.1 grant #include <sys/param.h>
31 1.1 grant #include <sys/device.h>
32 1.1 grant #include <sys/systm.h>
33 1.11 ad #include <sys/mutex.h>
34 1.1 grant
35 1.1 grant #include <dev/ofw/openfirm.h>
36 1.1 grant #include <machine/autoconf.h>
37 1.1 grant
38 1.3 macallan #include <macppc/dev/ki2cvar.h>
39 1.1 grant
40 1.20 macallan #ifdef KI2C_DEBUG
41 1.20 macallan #define DPRINTF printf
42 1.20 macallan #else
43 1.20 macallan #define DPRINTF while (0) printf
44 1.20 macallan #endif
45 1.20 macallan
46 1.17 matt int ki2c_match(device_t, cfdata_t, void *);
47 1.17 matt void ki2c_attach(device_t, device_t, void *);
48 1.1 grant inline u_int ki2c_readreg(struct ki2c_softc *, int);
49 1.1 grant inline void ki2c_writereg(struct ki2c_softc *, int, u_int);
50 1.1 grant u_int ki2c_getmode(struct ki2c_softc *);
51 1.1 grant void ki2c_setmode(struct ki2c_softc *, u_int);
52 1.1 grant u_int ki2c_getspeed(struct ki2c_softc *);
53 1.1 grant void ki2c_setspeed(struct ki2c_softc *, u_int);
54 1.1 grant int ki2c_intr(struct ki2c_softc *);
55 1.1 grant int ki2c_poll(struct ki2c_softc *, int);
56 1.1 grant int ki2c_start(struct ki2c_softc *, int, int, void *, int);
57 1.1 grant int ki2c_read(struct ki2c_softc *, int, int, void *, int);
58 1.3 macallan int ki2c_write(struct ki2c_softc *, int, int, void *, int);
59 1.13 dsl int ki2c_print(void *, const char *);
60 1.3 macallan
61 1.3 macallan /* I2C glue */
62 1.3 macallan static int ki2c_i2c_acquire_bus(void *, int);
63 1.3 macallan static void ki2c_i2c_release_bus(void *, int);
64 1.3 macallan static int ki2c_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t,
65 1.3 macallan void *, size_t, int);
66 1.3 macallan
67 1.1 grant
68 1.18 macallan CFATTACH_DECL_NEW(ki2c, sizeof(struct ki2c_softc), ki2c_match, ki2c_attach,
69 1.9 dogcow NULL, NULL);
70 1.1 grant
71 1.1 grant int
72 1.17 matt ki2c_match(device_t parent, cfdata_t match, void *aux)
73 1.1 grant {
74 1.1 grant struct confargs *ca = aux;
75 1.1 grant
76 1.1 grant if (strcmp(ca->ca_name, "i2c") == 0)
77 1.1 grant return 1;
78 1.1 grant
79 1.1 grant return 0;
80 1.1 grant }
81 1.1 grant
82 1.1 grant void
83 1.17 matt ki2c_attach(device_t parent, device_t self, void *aux)
84 1.1 grant {
85 1.17 matt struct ki2c_softc *sc = device_private(self);
86 1.1 grant struct confargs *ca = aux;
87 1.1 grant int node = ca->ca_node;
88 1.20 macallan uint32_t addr;
89 1.4 macallan int rate, child, namelen, i2cbus;
90 1.3 macallan struct ki2c_confargs ka;
91 1.3 macallan struct i2cbus_attach_args iba;
92 1.20 macallan prop_dictionary_t dict = device_properties(self);
93 1.20 macallan prop_array_t cfg;
94 1.3 macallan char name[32];
95 1.3 macallan u_int reg[20];
96 1.18 macallan
97 1.18 macallan sc->sc_dev = self;
98 1.1 grant ca->ca_reg[0] += ca->ca_baseaddr;
99 1.1 grant
100 1.1 grant if (OF_getprop(node, "AAPL,i2c-rate", &rate, 4) != 4) {
101 1.20 macallan aprint_error(": cannot get i2c-rate\n");
102 1.1 grant return;
103 1.1 grant }
104 1.20 macallan if (OF_getprop(node, "AAPL,address", &addr, 4) != 4) {
105 1.20 macallan aprint_error(": unable to find i2c address\n");
106 1.1 grant return;
107 1.1 grant }
108 1.20 macallan sc->sc_reg = mapiodev(addr, PAGE_SIZE, false);
109 1.1 grant if (OF_getprop(node, "AAPL,address-step", &sc->sc_regstep, 4) != 4) {
110 1.20 macallan aprint_error(": unable to find i2c address step\n");
111 1.1 grant return;
112 1.1 grant }
113 1.1 grant
114 1.1 grant printf("\n");
115 1.1 grant
116 1.1 grant ki2c_writereg(sc, STATUS, 0);
117 1.1 grant ki2c_writereg(sc, ISR, 0);
118 1.1 grant ki2c_writereg(sc, IER, 0);
119 1.1 grant
120 1.1 grant ki2c_setmode(sc, I2C_STDSUBMODE);
121 1.1 grant ki2c_setspeed(sc, I2C_100kHz); /* XXX rate */
122 1.3 macallan
123 1.11 ad mutex_init(&sc->sc_buslock, MUTEX_DEFAULT, IPL_NONE);
124 1.3 macallan ki2c_writereg(sc, IER,I2C_INT_DATA|I2C_INT_ADDR|I2C_INT_STOP);
125 1.3 macallan
126 1.20 macallan cfg = prop_array_create();
127 1.20 macallan prop_dictionary_set(dict, "i2c-child-devices", cfg);
128 1.20 macallan prop_object_release(cfg);
129 1.20 macallan
130 1.3 macallan /* fill in the i2c tag */
131 1.3 macallan sc->sc_i2c.ic_cookie = sc;
132 1.3 macallan sc->sc_i2c.ic_acquire_bus = ki2c_i2c_acquire_bus;
133 1.3 macallan sc->sc_i2c.ic_release_bus = ki2c_i2c_release_bus;
134 1.3 macallan sc->sc_i2c.ic_send_start = NULL;
135 1.3 macallan sc->sc_i2c.ic_send_stop = NULL;
136 1.3 macallan sc->sc_i2c.ic_initiate_xfer = NULL;
137 1.3 macallan sc->sc_i2c.ic_read_byte = NULL;
138 1.3 macallan sc->sc_i2c.ic_write_byte = NULL;
139 1.3 macallan sc->sc_i2c.ic_exec = ki2c_i2c_exec;
140 1.3 macallan
141 1.19 chs memset(&iba, 0, sizeof(iba));
142 1.3 macallan iba.iba_tag = &sc->sc_i2c;
143 1.18 macallan (void) config_found_ia(sc->sc_dev, "i2cbus", &iba, iicbus_print);
144 1.3 macallan
145 1.4 macallan /*
146 1.4 macallan * newer OF puts I2C devices under 'i2c-bus' instead of attaching them
147 1.4 macallan * directly to the ki2c node so we just check if we have a child named
148 1.4 macallan * 'i2c-bus' and if so we attach its children, not ours
149 1.4 macallan */
150 1.4 macallan i2cbus = 0;
151 1.4 macallan child = OF_child(node);
152 1.4 macallan while ((child != 0) && (i2cbus == 0)) {
153 1.4 macallan OF_getprop(child, "name", name, sizeof(name));
154 1.4 macallan if (strcmp(name, "i2c-bus") == 0)
155 1.4 macallan i2cbus = child;
156 1.4 macallan child = OF_peer(child);
157 1.4 macallan }
158 1.4 macallan if (i2cbus == 0)
159 1.4 macallan i2cbus = node;
160 1.4 macallan
161 1.4 macallan for (child = OF_child(i2cbus); child; child = OF_peer(child)) {
162 1.10 garbled int ok = 0;
163 1.3 macallan namelen = OF_getprop(child, "name", name, sizeof(name));
164 1.3 macallan if (namelen < 0)
165 1.3 macallan continue;
166 1.3 macallan if (namelen >= sizeof(name))
167 1.3 macallan continue;
168 1.3 macallan
169 1.3 macallan name[namelen] = 0;
170 1.3 macallan ka.ka_name = name;
171 1.3 macallan ka.ka_node = child;
172 1.10 garbled ok = OF_getprop(child, "reg", reg, sizeof(reg));
173 1.10 garbled if (ok <= 0) {
174 1.10 garbled ok = OF_getprop(child, "i2c-address", reg,
175 1.10 garbled sizeof(reg));
176 1.10 garbled }
177 1.10 garbled if (ok > 0) {
178 1.20 macallan ka.ka_addr = reg[0] >> 1;
179 1.3 macallan ka.ka_tag = &sc->sc_i2c;
180 1.8 drochner config_found_ia(self, "ki2c", &ka, ki2c_print);
181 1.10 garbled }
182 1.10 garbled #ifdef DIAGNOSTIC
183 1.10 garbled else {
184 1.10 garbled printf("%s: device (%s) has no reg or i2c-address property.\n",
185 1.18 macallan device_xname(sc->sc_dev), name);
186 1.3 macallan }
187 1.10 garbled #endif
188 1.3 macallan }
189 1.3 macallan }
190 1.3 macallan
191 1.3 macallan int
192 1.14 dsl ki2c_print(void *aux, const char *ki2c)
193 1.3 macallan {
194 1.3 macallan struct ki2c_confargs *ka = aux;
195 1.3 macallan
196 1.3 macallan if (ki2c) {
197 1.3 macallan aprint_normal("%s at %s", ka->ka_name, ki2c);
198 1.3 macallan aprint_normal(" address 0x%x", ka->ka_addr);
199 1.3 macallan }
200 1.3 macallan return UNCONF;
201 1.1 grant }
202 1.1 grant
203 1.1 grant u_int
204 1.14 dsl ki2c_readreg(struct ki2c_softc *sc, int reg)
205 1.1 grant {
206 1.1 grant u_char *addr = sc->sc_reg + sc->sc_regstep * reg;
207 1.1 grant
208 1.1 grant return *addr;
209 1.1 grant }
210 1.1 grant
211 1.1 grant void
212 1.14 dsl ki2c_writereg(struct ki2c_softc *sc, int reg, u_int val)
213 1.1 grant {
214 1.1 grant u_char *addr = sc->sc_reg + sc->sc_regstep * reg;
215 1.1 grant
216 1.1 grant *addr = val;
217 1.6 perry __asm volatile ("eieio");
218 1.1 grant delay(10);
219 1.1 grant }
220 1.1 grant
221 1.1 grant u_int
222 1.14 dsl ki2c_getmode(struct ki2c_softc *sc)
223 1.1 grant {
224 1.1 grant return ki2c_readreg(sc, MODE) & I2C_MODE;
225 1.1 grant }
226 1.1 grant
227 1.1 grant void
228 1.14 dsl ki2c_setmode(struct ki2c_softc *sc, u_int mode)
229 1.1 grant {
230 1.1 grant u_int x;
231 1.1 grant
232 1.1 grant KASSERT((mode & ~I2C_MODE) == 0);
233 1.1 grant x = ki2c_readreg(sc, MODE);
234 1.1 grant x &= ~I2C_MODE;
235 1.1 grant x |= mode;
236 1.1 grant ki2c_writereg(sc, MODE, x);
237 1.1 grant }
238 1.1 grant
239 1.1 grant u_int
240 1.14 dsl ki2c_getspeed(struct ki2c_softc *sc)
241 1.1 grant {
242 1.1 grant return ki2c_readreg(sc, MODE) & I2C_SPEED;
243 1.1 grant }
244 1.1 grant
245 1.1 grant void
246 1.14 dsl ki2c_setspeed(struct ki2c_softc *sc, u_int speed)
247 1.1 grant {
248 1.1 grant u_int x;
249 1.1 grant
250 1.1 grant KASSERT((speed & ~I2C_SPEED) == 0);
251 1.1 grant x = ki2c_readreg(sc, MODE);
252 1.1 grant x &= ~I2C_SPEED;
253 1.1 grant x |= speed;
254 1.1 grant ki2c_writereg(sc, MODE, x);
255 1.1 grant }
256 1.1 grant
257 1.1 grant int
258 1.14 dsl ki2c_intr(struct ki2c_softc *sc)
259 1.1 grant {
260 1.1 grant u_int isr, x;
261 1.1 grant
262 1.1 grant isr = ki2c_readreg(sc, ISR);
263 1.1 grant if (isr & I2C_INT_ADDR) {
264 1.1 grant #if 0
265 1.1 grant if ((ki2c_readreg(sc, STATUS) & I2C_ST_LASTAAK) == 0) {
266 1.1 grant /* No slave responded. */
267 1.1 grant sc->sc_flags |= I2C_ERROR;
268 1.1 grant goto out;
269 1.1 grant }
270 1.1 grant #endif
271 1.1 grant
272 1.1 grant if (sc->sc_flags & I2C_READING) {
273 1.1 grant if (sc->sc_resid > 1) {
274 1.1 grant x = ki2c_readreg(sc, CONTROL);
275 1.1 grant x |= I2C_CT_AAK;
276 1.1 grant ki2c_writereg(sc, CONTROL, x);
277 1.1 grant }
278 1.1 grant } else {
279 1.1 grant ki2c_writereg(sc, DATA, *sc->sc_data++);
280 1.1 grant sc->sc_resid--;
281 1.1 grant }
282 1.1 grant }
283 1.1 grant
284 1.1 grant if (isr & I2C_INT_DATA) {
285 1.1 grant if (sc->sc_flags & I2C_READING) {
286 1.1 grant *sc->sc_data++ = ki2c_readreg(sc, DATA);
287 1.1 grant sc->sc_resid--;
288 1.1 grant
289 1.1 grant if (sc->sc_resid == 0) { /* Completed */
290 1.1 grant ki2c_writereg(sc, CONTROL, 0);
291 1.1 grant goto out;
292 1.1 grant }
293 1.1 grant } else {
294 1.1 grant #if 0
295 1.1 grant if ((ki2c_readreg(sc, STATUS) & I2C_ST_LASTAAK) == 0) {
296 1.1 grant /* No slave responded. */
297 1.1 grant sc->sc_flags |= I2C_ERROR;
298 1.1 grant goto out;
299 1.1 grant }
300 1.1 grant #endif
301 1.1 grant
302 1.1 grant if (sc->sc_resid == 0) {
303 1.1 grant x = ki2c_readreg(sc, CONTROL) | I2C_CT_STOP;
304 1.1 grant ki2c_writereg(sc, CONTROL, x);
305 1.1 grant } else {
306 1.1 grant ki2c_writereg(sc, DATA, *sc->sc_data++);
307 1.1 grant sc->sc_resid--;
308 1.1 grant }
309 1.1 grant }
310 1.1 grant }
311 1.1 grant
312 1.1 grant out:
313 1.1 grant if (isr & I2C_INT_STOP) {
314 1.1 grant ki2c_writereg(sc, CONTROL, 0);
315 1.1 grant sc->sc_flags &= ~I2C_BUSY;
316 1.1 grant }
317 1.1 grant
318 1.1 grant ki2c_writereg(sc, ISR, isr);
319 1.1 grant
320 1.1 grant return 1;
321 1.1 grant }
322 1.1 grant
323 1.1 grant int
324 1.14 dsl ki2c_poll(struct ki2c_softc *sc, int timo)
325 1.1 grant {
326 1.1 grant while (sc->sc_flags & I2C_BUSY) {
327 1.1 grant if (ki2c_readreg(sc, ISR))
328 1.1 grant ki2c_intr(sc);
329 1.1 grant timo -= 100;
330 1.1 grant if (timo < 0) {
331 1.20 macallan DPRINTF("i2c_poll: timeout\n");
332 1.1 grant return -1;
333 1.1 grant }
334 1.1 grant delay(100);
335 1.1 grant }
336 1.1 grant return 0;
337 1.1 grant }
338 1.1 grant
339 1.1 grant int
340 1.15 dsl ki2c_start(struct ki2c_softc *sc, int addr, int subaddr, void *data, int len)
341 1.1 grant {
342 1.1 grant int rw = (sc->sc_flags & I2C_READING) ? 1 : 0;
343 1.1 grant int timo, x;
344 1.1 grant
345 1.1 grant KASSERT((addr & 1) == 0);
346 1.1 grant
347 1.1 grant sc->sc_data = data;
348 1.1 grant sc->sc_resid = len;
349 1.1 grant sc->sc_flags |= I2C_BUSY;
350 1.1 grant
351 1.1 grant timo = 1000 + len * 200;
352 1.1 grant
353 1.1 grant /* XXX TAS3001 sometimes takes 50ms to finish writing registers. */
354 1.1 grant /* if (addr == 0x68) */
355 1.1 grant timo += 100000;
356 1.1 grant
357 1.1 grant ki2c_writereg(sc, ADDR, addr | rw);
358 1.1 grant ki2c_writereg(sc, SUBADDR, subaddr);
359 1.1 grant
360 1.1 grant x = ki2c_readreg(sc, CONTROL) | I2C_CT_ADDR;
361 1.1 grant ki2c_writereg(sc, CONTROL, x);
362 1.1 grant
363 1.1 grant if (ki2c_poll(sc, timo))
364 1.1 grant return -1;
365 1.1 grant if (sc->sc_flags & I2C_ERROR) {
366 1.20 macallan DPRINTF("I2C_ERROR\n");
367 1.1 grant return -1;
368 1.1 grant }
369 1.1 grant return 0;
370 1.1 grant }
371 1.1 grant
372 1.1 grant int
373 1.15 dsl ki2c_read(struct ki2c_softc *sc, int addr, int subaddr, void *data, int len)
374 1.1 grant {
375 1.1 grant sc->sc_flags = I2C_READING;
376 1.20 macallan DPRINTF("ki2c_read: %02x %d\n", addr, len);
377 1.1 grant return ki2c_start(sc, addr, subaddr, data, len);
378 1.1 grant }
379 1.1 grant
380 1.1 grant int
381 1.15 dsl ki2c_write(struct ki2c_softc *sc, int addr, int subaddr, void *data, int len)
382 1.1 grant {
383 1.1 grant sc->sc_flags = 0;
384 1.20 macallan DPRINTF("ki2c_write: %02x %d\n",addr,len);
385 1.3 macallan return ki2c_start(sc, addr, subaddr, data, len);
386 1.3 macallan }
387 1.3 macallan
388 1.3 macallan static int
389 1.3 macallan ki2c_i2c_acquire_bus(void *cookie, int flags)
390 1.3 macallan {
391 1.3 macallan struct ki2c_softc *sc = cookie;
392 1.3 macallan
393 1.11 ad mutex_enter(&sc->sc_buslock);
394 1.11 ad return 0;
395 1.3 macallan }
396 1.3 macallan
397 1.3 macallan static void
398 1.3 macallan ki2c_i2c_release_bus(void *cookie, int flags)
399 1.3 macallan {
400 1.3 macallan struct ki2c_softc *sc = cookie;
401 1.3 macallan
402 1.11 ad mutex_exit(&sc->sc_buslock);
403 1.3 macallan }
404 1.3 macallan
405 1.3 macallan int
406 1.3 macallan ki2c_i2c_exec(void *cookie, i2c_op_t op, i2c_addr_t addr, const void *vcmd,
407 1.3 macallan size_t cmdlen, void *vbuf, size_t buflen, int flags)
408 1.3 macallan {
409 1.3 macallan struct ki2c_softc *sc = cookie;
410 1.12 pgoyette int i;
411 1.12 pgoyette size_t w_len;
412 1.12 pgoyette uint8_t *wp;
413 1.12 pgoyette uint8_t wrbuf[I2C_EXEC_MAX_CMDLEN + I2C_EXEC_MAX_CMDLEN];
414 1.12 pgoyette
415 1.12 pgoyette /*
416 1.12 pgoyette * We don't have any idea if the ki2c controller can execute
417 1.12 pgoyette * i2c quick_{read,write} operations, so if someone tries one,
418 1.12 pgoyette * return an error.
419 1.12 pgoyette */
420 1.12 pgoyette if (cmdlen == 0 && buflen == 0)
421 1.12 pgoyette return -1;
422 1.12 pgoyette
423 1.3 macallan /* we handle the subaddress stuff ourselves */
424 1.3 macallan ki2c_setmode(sc, I2C_STDMODE);
425 1.3 macallan
426 1.12 pgoyette /* Write-buffer defaults to vcmd */
427 1.12 pgoyette wp = (uint8_t *)(__UNCONST(vcmd));
428 1.12 pgoyette w_len = cmdlen;
429 1.12 pgoyette
430 1.12 pgoyette /*
431 1.12 pgoyette * Concatenate vcmd and vbuf for write operations
432 1.12 pgoyette *
433 1.12 pgoyette * Drivers written specifically for ki2c might already do this,
434 1.12 pgoyette * but "generic" i2c drivers still provide separate arguments
435 1.12 pgoyette * for the cmd and buf parts of iic_smbus_write_{byte,word}.
436 1.12 pgoyette */
437 1.12 pgoyette if (I2C_OP_WRITE_P(op) && buflen != 0) {
438 1.12 pgoyette if (cmdlen == 0) {
439 1.12 pgoyette wp = (uint8_t *)vbuf;
440 1.12 pgoyette w_len = buflen;
441 1.12 pgoyette } else {
442 1.12 pgoyette KASSERT((cmdlen + buflen) <= sizeof(wrbuf));
443 1.12 pgoyette wp = (uint8_t *)(__UNCONST(vcmd));
444 1.12 pgoyette w_len = 0;
445 1.12 pgoyette for (i = 0; i < cmdlen; i++)
446 1.12 pgoyette wrbuf[w_len++] = *wp++;
447 1.12 pgoyette wp = (uint8_t *)vbuf;
448 1.12 pgoyette for (i = 0; i < buflen; i++)
449 1.12 pgoyette wrbuf[w_len++] = *wp++;
450 1.12 pgoyette wp = wrbuf;
451 1.12 pgoyette }
452 1.12 pgoyette }
453 1.12 pgoyette
454 1.20 macallan if (ki2c_write(sc, addr << 1, 0, wp, w_len) !=0 )
455 1.3 macallan return -1;
456 1.10 garbled
457 1.10 garbled if (I2C_OP_READ_P(op)) {
458 1.20 macallan if (ki2c_read(sc, addr << 1, 0, vbuf, buflen) !=0 )
459 1.3 macallan return -1;
460 1.3 macallan }
461 1.3 macallan return 0;
462 1.1 grant }
463