| 00:42.47 | *** join/#htc-linux patoche (n=pat@lns-bzn-52-82-65-74-187.adsl.proxad.net) |
| 01:35.23 | *** join/#htc-linux par (i=par@dipole.idlepattern.com) |
| 01:36.10 | *** join/#htc-linux JohnnyK (n=johnnyk@area1-132-gw.hkfree.org) |
| 03:01.37 | *** join/#htc-linux S^P (n=Masood@static-host119-30-95-214.link.net.pk) |
| 03:13.28 | BabelO | cr2: Angstrom image with qtopia run on HTC Artemis :) http://pastebin.ca/1014366 |
| 03:13.50 | BabelO | cr2: tomorrow i ll try to add again htc-egpio with 2.6.26 :) that s cool !!! |
| 03:13.53 | BabelO | good night |
| 03:22.36 | *** join/#htc-linux S^P (n=Masood@static-host119-30-80-142.link.net.pk) |
| 04:01.13 | *** join/#htc-linux S^P (n=Masood@static-host119-30-81-79.link.net.pk) |
| 04:26.09 | *** join/#htc-linux swc|666 (n=swc|666@c66-235-5-56.sea2.cablespeed.com) |
| 06:03.07 | *** join/#htc-linux S^P (n=Masood@static-host119-30-85-224.link.net.pk) |
| 07:13.00 | *** join/#htc-linux rmoravcik (n=rmoravci@ip-89-102-255-171.karneval.cz) |
| 07:13.34 | *** join/#htc-linux JohnnyK (n=johnnyk@area1-132-gw.hkfree.org) |
| 07:49.57 | *** join/#htc-linux goxboxlive (n=goxboxli@208.84-48-176.nextgentel.com) |
| 08:23.41 | *** join/#htc-linux dortega (n=David@238.Red-88-16-218.dynamicIP.rima-tde.net) |
| 09:22.00 | *** join/#htc-linux ecze (n=ecze@eczema.ecze.com) |
| 09:35.26 | *** join/#htc-linux exco (n=excogita@e181070227.adsl.alicedsl.de) |
| 09:48.08 | *** join/#htc-linux Marex (n=marex@85-132-216-250-eth3-gwfm10-user.802.cz) |
| 09:52.35 | *** join/#htc-linux pH5 (n=ph5@p5485EF13.dip.t-dialin.net) |
| 10:00.50 | *** join/#htc-linux S^P (n=Masood@static-host119-30-95-219.link.net.pk) |
| 10:12.25 | *** join/#htc-linux skodde (n=skodde@unaffiliated/skodde) |
| 10:16.50 | *** join/#htc-linux patoche (n=Patrice@lns-bzn-52-82-65-74-187.adsl.proxad.net) |
| 10:22.09 | *** join/#htc-linux okias (i=ejabberd@poseidon.kraja.cz) |
| 10:23.02 | *** join/#htc-linux rmoravcik (n=rmoravci@ip-89-102-255-171.karneval.cz) |
| 10:40.20 | *** join/#htc-linux fdasfasdf (n=Masood@static-host119-30-81-85.link.net.pk) |
| 10:46.50 | *** join/#htc-linux rmoravcik (n=rmoravci@ip-89-102-255-171.karneval.cz) |
| 11:01.19 | *** join/#htc-linux marbalon (n=balon@aegl126.neoplus.adsl.tpnet.pl) |
| 11:25.04 | *** join/#htc-linux dcordes (n=dcordes_@unaffiliated/dcordes) |
| 11:43.58 | *** join/#htc-linux BabelO (n=Fabrice@lun34-2-82-238-28-28.fbx.proxad.net) |
| 11:48.19 | *** join/#htc-linux rmoravcik (n=rmoravci@ip-89-102-255-171.karneval.cz) |
| 11:51.18 | *** join/#htc-linux dzo (n=dzo@121.98.128.127) |
| 11:54.57 | *** join/#htc-linux techsolo (n=koen@amp89.ampersant.be) |
| 11:55.10 | *** part/#htc-linux exco (n=excogita@e181070227.adsl.alicedsl.de) |
| 11:56.40 | BabelO | hi |
| 11:56.56 | BabelO | pH5: around ? :) |
| 11:58.04 | techsolo | hi |
| 12:19.02 | BabelO | pH5: what does this mean : |
| 12:19.04 | BabelO | gpiochip_add: gpios 193..225 (htc-egpio) not registered |
| 12:19.04 | BabelO | gpiochip_add: gpios 257..281 (htc-egpio) not registered |
| 12:31.47 | pH5 | BabelO: look at gpio_chip add in drivers/gpiolib.c |
| 12:31.56 | *** join/#htc-linux miknix (n=miknix@81.193.88.108) |
| 12:32.18 | pH5 | this error message (and -EINVAL) means that gpio_is_valid(..) returned false for the GPIO numbers you want to assign to htc-egpio |
| 12:32.54 | BabelO | pH5: yes that is what i was looking at |
| 12:33.34 | BabelO | pH5: ok I m tryng a different base, highter |
| 12:35.36 | BabelO | pH5: ok found the declaration :) |
| 12:35.45 | BabelO | pH5: #define ARCH_NR_GPIOS 256 |
| 12:35.49 | BabelO | if no define |
| 12:36.27 | pH5 | BabelO: what is the highest on-board gpio #? |
| 12:36.43 | pH5 | s/on-board/cpu/ |
| 12:36.44 | BabelO | pH5: according to wiki it is 191 |
| 12:37.18 | BabelO | pH5: i set it to 193 because not sure about gpio0 , lol |
| 12:38.19 | pH5 | BabelO: still, why does the first gpiochip fail? 225 < 256 |
| 12:40.57 | BabelO | right :( |
| 12:44.53 | miknix | hey |
| 12:44.56 | miknix | 011.386 IRQS GIRQ3: IS76(172)=1 |
| 12:45.15 | miknix | the IRQ here is 76 right? |
| 12:45.27 | miknix | 172 is just the haret numbering? |
| 12:45.42 | BabelO | miknix: yes |
| 12:45.51 | *** join/#htc-linux dcordes (n=guybrush@unaffiliated/dcordes) |
| 12:45.56 | dcordes | hi |
| 12:46.19 | *** join/#htc-linux patoche (n=Patrice@lns-bzn-52-82-65-74-187.adsl.proxad.net) |
| 12:46.25 | dcordes | marbalon, forget about what I said about the driver. it seems to be fixed now |
| 12:46.25 | miknix | BabelO, thanks |
| 12:47.07 | BabelO | miknix: it is same than me |
| 12:47.26 | marbalon | dcordes: grate, i have just finish jog wheel. so keyboard driver is done |
| 12:48.34 | marbalon | dcordes: I also remap PAD_OK to KEY_BACK, we have other OK button on the pad_center |
| 12:48.37 | dcordes | marbalon, cool. one question: Somehow I don't build touchscreen support with my config. What is the CONFIG I have to set for kaiser ts? |
| 12:49.41 | marbalon | dcordes: obj-$(CONFIG_MACH_HTCKAISER) += board-htckaiser.o 7x00-irq.o tsc2003.o board-kaiser-keypad.o |
| 12:49.59 | marbalon | ts driver is compiled if HTCKAISER is enabled |
| 12:50.08 | dcordes | I see |
| 12:50.31 | dcordes | obj-$(CONFIG_MACH_HTCKAISER) += board-htckaiser.o 7x00-irq.o tsc2003.o board-kaiser-keypad.o |
| 12:50.43 | dcordes | hm. but people in xda forum say they have no touchscreen with my latest build |
| 12:51.06 | dcordes | maybe I miss a depency for tsc2003.c? |
| 12:51.12 | dcordes | dependency |
| 12:51.33 | marbalon | hmm. maye missing i2c ? |
| 12:52.10 | marbalon | moment, I will try to run android with my newest zImage |
| 12:52.16 | dcordes | ok good |
| 12:52.25 | dcordes | CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y |
| 12:52.25 | dcordes | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
| 12:52.25 | dcordes | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
| 12:52.25 | dcordes | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
| 12:52.25 | dcordes | CONFIG_INPUT_MISC=y |
| 12:52.26 | dcordes | # CONFIG_INPUT_UINPUT is not set |
| 12:52.28 | dcordes | CONFIG_INPUT_GPIO=y |
| 12:52.59 | dcordes | CONFIG_I2C=y |
| 12:52.59 | dcordes | CONFIG_I2C_BOARDINFO=y |
| 12:52.59 | dcordes | CONFIG_I2C_CHARDEV=y |
| 12:53.03 | dcordes | CONFIG_I2C_MSM=y |
| 12:57.20 | *** join/#htc-linux revertive (n=revertiv@83.119.75.151) |
| 12:57.49 | marbalon | dcordes: hmm. ts don't work for me too :( |
| 12:59.05 | dcordes | looks like we broke something. |
| 12:59.29 | marbalon | yes |
| 12:59.41 | *** join/#htc-linux S^P (n=Masood@static-host119-30-86-186.link.net.pk) |
| 13:07.34 | dcordes | marbalon, is this the first time you try TS with linuxtogo? |
| 13:07.52 | dcordes | maybe I forgot to commit something |
| 13:08.29 | marbalon | yes, I often use angstrom image so I don't use TS for a long time |
| 13:09.09 | dcordes | yes same here |
| 13:09.28 | dcordes | marbalon, is there anything not in arch/arm/mach-msm directory that is needed by tsc2003.c? |
| 13:09.35 | dcordes | (anything we changed) |
| 13:10.52 | dcordes | did we modify anything in drivers? |
| 13:11.17 | marbalon | dcordes: ts driver is not probed |
| 13:11.32 | marbalon | somthing missing in our board file |
| 13:11.46 | dcordes | I'm looking at the board file at this moment |
| 13:13.21 | dcordes | marbalon, tsc only is in i2c_board_info __initdata vogue_i2c_board_info[] struct |
| 13:15.29 | marbalon | dcordes: I doon't sure but 229 line should be I2C_BOARD_INFO("kaiser-ts", 0x48), |
| 13:17.26 | dcordes | marbalon, where does the value in the " point to? a file? |
| 13:17.48 | marbalon | dcordes: I don't understand platform drivers but platform devices find drivers using names |
| 13:17.56 | marbalon | dcordes: works for me now |
| 13:19.18 | dcordes | so you changed line 299 from "I2C_BOARD_INFO("tsc2003-ts", 0x48)," to "I2C_BOARD_INFO("kaiser-ts", 0x48)," ? |
| 13:20.12 | marbalon | dcordes: commited and pushed to git ;) |
| 13:20.28 | dcordes | great |
| 13:21.20 | marbalon | hmm I get an error while pushing :( |
| 13:21.29 | dcordes | not fast forward? |
| 13:21.32 | marbalon | <PROTECTED> |
| 13:21.35 | dcordes | ok |
| 13:21.50 | dcordes | it is because I pushed a commit yesterday and you didn't have this |
| 13:21.59 | marbalon | git update ? |
| 13:22.10 | dcordes | so when you are not up to date and try commit you get this error. no you need to rebase |
| 13:22.21 | dcordes | that will set your change on top of latest change |
| 13:22.42 | marbalon | dcordes: git pull command ? |
| 13:22.50 | dcordes | a guy named shoragan explained it for me yesterday |
| 13:23.33 | dcordes | try "git fetch && git rebase origin/htc-msm" |
| 13:23.42 | dcordes | then see in git log if my latest change is in |
| 13:23.56 | *** join/#htc-linux exco (n=excogita@e181070227.adsl.alicedsl.de) |
| 13:24.11 | marbalon | dcordes: I don't lose my changes ? |
| 13:24.49 | dcordes | hm don't know. I only had my commit changed when I rebased |
| 13:27.01 | dcordes | not sure. better make backup |
| 13:28.17 | marbalon | I made backup, use git fetch... but still have a problem :( |
| 13:29.42 | dcordes | also made the rebase? |
| 13:30.34 | marbalon | dcordes: ok, use git pull and git push works fine but there is something went wrong, look into git |
| 13:30.58 | dcordes | ok |
| 13:31.00 | marbalon | there is a git gutu ??? |
| 13:31.05 | marbalon | *guru |
| 13:31.12 | marbalon | ?? |
| 13:31.24 | dcordes | oops shit |
| 13:32.18 | marbalon | how remove last commit/merge ??? http://git.linuxtogo.org/?p=groups/mobile-linux/kernel.git;a=shortlog;h=refs/heads/htc-msm |
| 13:32.43 | dcordes | pH5, ping |
| 13:32.49 | marbalon | this commit is empty |
| 13:33.00 | dcordes | 13 min ago |
| 13:33.01 | dcordes | Marcin Baliniak |
| 13:33.01 | dcordes | fix ts driver |
| 13:33.09 | dcordes | looks like you already committed it |
| 13:33.15 | dcordes | yet before the rebase |
| 13:33.56 | marbalon | dcordes: Merge commit is empty |
| 13:34.02 | marbalon | ts commit is good |
| 13:34.13 | dcordes | I don't know where this merge comes from |
| 13:35.01 | *** join/#htc-linux CVirus (n=GoD@196.205.192.185) |
| 13:35.44 | marbalon | hmm, maybe I know http://pastebin.ca/1014726 |
| 13:36.18 | dcordes | damn why does pastebin.ca never work for me |
| 13:36.28 | dcordes | marbalon, can you put it on rafb.net or so? |
| 13:37.08 | marbalon | rafdb.net don't work for me :( |
| 13:37.57 | dcordes | then pastebin.com or something else |
| 13:39.21 | marbalon | http://baliniak.pl/android/error.txt |
| 13:40.30 | marbalon | loks like effect of "git fetch && git rebase origin/htc-msm" |
| 13:40.43 | marbalon | another commit created |
| 13:41.35 | dcordes | no idea. let's wait for pH5 or so |
| 13:42.00 | dcordes | marbalon, so now that keyboard is done what about sd? :) |
| 13:43.09 | dcordes | shoragan, ping |
| 13:43.44 | marbalon | yes, but now i should turn off comp, it is good weather here so best idea - go for a walk with my soon ;) |
| 13:44.15 | dcordes | going out is a good idea |
| 13:45.02 | marbalon | bbl, plese ask pH5 how to remove this dummy commit. thanks |
| 13:46.15 | *** join/#htc-linux goxboxlive (n=goxboxli@208.84-48-176.nextgentel.com) |
| 14:03.29 | *** join/#htc-linux JohnnyK_ (n=johnnyk@area1-132-gw.hkfree.org) |
| 14:25.41 | *** join/#htc-linux aLeSD (n=alex@193.153.123.149) |
| 14:29.35 | *** join/#htc-linux BabelO (n=Fabrice@lun34-2-82-238-28-28.fbx.proxad.net) |
| 14:33.14 | miknix | Kevin2, hi |
| 14:35.32 | miknix | I'm trying to use request_irq() for registering an handler for IRQ 141 |
| 14:35.42 | miknix | but it fails with error -22 |
| 14:39.36 | miknix | oh |
| 14:39.37 | miknix | I found |
| 14:39.38 | miknix | it |
| 14:41.56 | miknix | forgot to put GPIO_IRQ() |
| 14:43.36 | Marex | hehe :) that happens |
| 14:44.46 | miknix | hum.. a string representation of errors would be nice |
| 14:45.09 | miknix | do you know the place with something like that? |
| 14:50.52 | *** join/#htc-linux mistadman (n=mistadma@adsl-241-125-151.msy.bellsouth.net) |
| 14:53.26 | Marex | nope, never needed it |
| 14:55.29 | *** join/#htc-linux S^P_ (n=Masood@static-host119-30-91-157.link.net.pk) |
| 14:57.46 | *** join/#htc-linux patoche_ (n=Patrice@lns-bzn-58-82-251-203-145.adsl.proxad.net) |
| 15:02.39 | miknix | too much interrupts, this is not the one I want |
| 15:25.03 | *** join/#htc-linux S^P (n=Masood@static-host119-30-93-84.link.net.pk) |
| 15:31.50 | *** join/#htc-linux S^P_ (n=Masood@static-host119-30-93-155.link.net.pk) |
| 15:45.41 | *** join/#htc-linux kiozen (n=kiozen@rgnb-4db1dee8.pool.einsundeins.de) |
| 15:46.41 | kiozen | cr2: fyi Garmin support in GT (Wpt up/down, Trk down), svn up! |
| 15:58.48 | *** join/#htc-linux patoche_ (n=Patrice@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 16:43.42 | BabelO | pH5, cr2: http://pastebin.ca/1014865 |
| 16:43.42 | BabelO | pH5: i use this seetings |
| 16:43.53 | BabelO | now no error message |
| 16:44.41 | pH5 | what did you change? (what's the value of EGPIO_x_y_START?) |
| 16:47.36 | BabelO | dmesg is here http://pastebin.ca/1014868 |
| 16:47.51 | BabelO | pH5: i change the ARCH_NR_GPIOS for board omap |
| 16:48.14 | pH5 | ok, that makes sense |
| 16:48.45 | BabelO | pH5: and i set here http://pastebin.ca/1014872 |
| 16:49.01 | BabelO | pH5: now my ARCH_NR_GPIOS is now set to 350 |
| 16:49.22 | BabelO | pH5: becauseactual omap seem to be 191 gpios, but i see some others |
| 16:49.38 | BabelO | pH5: but when i use those cpld gpios it fail |
| 16:51.16 | BabelO | pH5: i did not found my error :( |
| 16:57.10 | *** join/#htc-linux MHazem (n=GoD@196.205.192.185) |
| 16:59.32 | *** join/#htc-linux S^P (n=Masood@static-host119-30-81-87.link.net.pk) |
| 17:09.53 | miknix | damn |
| 17:11.25 | okias | miknix: Hi, are you still working on Wizard? |
| 17:11.43 | miknix | okias, hi, yes |
| 17:13.25 | miknix | I'm implementing a dpad driver using the i2c bus |
| 17:13.46 | miknix | I've already everything working, leds, backlight, vibrator... |
| 17:14.57 | miknix | I'm with a problem now.. when the dpad irq handler is called, the i2c data isnt available yet |
| 17:15.20 | miknix | so I guess I have to pull until it arrives |
| 17:15.25 | okias | miknix: good :-) |
| 17:16.01 | miknix | s/pull/poll/ |
| 17:37.54 | *** join/#htc-linux CVirus (n=GoD@196.205.192.185) |
| 17:49.51 | *** join/#htc-linux marbalon (n=balon@aegl126.neoplus.adsl.tpnet.pl) |
| 18:00.02 | *** part/#htc-linux okias (i=ejabberd@poseidon.kraja.cz) |
| 18:03.07 | miknix | Kevin2, ping |
| 18:18.35 | *** join/#htc-linux dcordes (n=dcordes@unaffiliated/dcordes) |
| 18:22.21 | *** join/#htc-linux S^P (n=Masood@static-host119-30-85-83.link.net.pk) |
| 18:24.01 | *** join/#htc-linux S^P (n=Masood@static-host119-30-85-83.link.net.pk) |
| 18:26.17 | BabelO | miknix: artemis works fine with 2.6.26-rc1 now |
| 18:26.27 | BabelO | miknix: i comit my patch tomorrow |
| 18:30.20 | *** join/#htc-linux exc1 (n=excogita@e181098175.adsl.alicedsl.de) |
| 18:36.08 | *** join/#htc-linux kiozen (n=kiozen@rgnb-4db1dee8.pool.einsundeins.de) |
| 18:36.25 | kiozen | hi |
| 18:36.37 | BabelO | ol kiozen |
| 18:37.10 | kiozen | BabelO: GT has Garmin support now :) |
| 18:37.23 | BabelO | i see :), but no garmin for me |
| 18:37.39 | BabelO | kiozen: once i get egpio working, i think artemis can use M inside :) |
| 18:37.46 | kiozen | BabelO: didn't you say your father had one ? |
| 18:38.19 | BabelO | kiozen: yes he have but for road navigation it is nuvi200 |
| 18:38.35 | kiozen | "M inside" ... shhh.... do not summit the Intel lawyers |
| 18:38.49 | kiozen | s/summit/summon/ |
| 18:40.26 | BabelO | :) |
| 18:40.47 | BabelO | kiozen: btw, qtopia look very nice on artemis ( small screen) |
| 18:41.07 | BabelO | kiozen: and i don't understand all guy saying that 201Mhz is not enough for qtopia |
| 18:41.22 | kiozen | ohhh, think you have to do optimize M for that :) |
| 18:41.32 | BabelO | i think they works too much with windows :) |
| 18:42.11 | kiozen | well it's a big performance difference if you have 2650x1600 pixel or 320x200 |
| 18:42.15 | BabelO | kiozen: why optimize ? memory footprint is ok now |
| 18:42.49 | kiozen | BabelO: but the layout is more for 480x640 than 200x320 |
| 18:43.07 | BabelO | kiozen: it look ok on blueangel for me |
| 18:43.29 | kiozen | but you din't see all stuff, did you |
| 18:44.05 | kiozen | the buttons should be too fat |
| 18:44.23 | kiozen | and the infoscreen on top should get crowded |
| 18:44.59 | kiozen | and the key handling has to be optimized if you use qpe |
| 18:46.22 | BabelO | kiozen: but i can redo some stuff for small screen ;) |
| 18:46.55 | kiozen | BabelO: that's what I mean, I tried to make M as modular as possible |
| 18:47.17 | BabelO | ok, but first need this egpio to works |
| 18:47.44 | BabelO | kiozen: this evening http://www.martinsolveig.com/ going to see that |
| 18:49.58 | kiozen | BabelO: funny, are they animated or real? |
| 18:51.50 | BabelO | kiozen: real |
| 18:52.24 | kiozen | BabelO: yeah, just watching the making of |
| 18:56.29 | pH5 | BabelO: here now |
| 18:57.06 | kiozen | BabelO: nice big place :) (maison carree) |
| 18:57.11 | BabelO | pH5: egpio still not working :( black screen on boot when i call set_gpio_value |
| 18:57.18 | BabelO | kiozen: yes :) |
| 18:57.29 | *** join/#htc-linux S^P_ (n=Masood@static-host119-30-86-232.link.net.pk) |
| 18:59.20 | pH5 | BabelO: you could enable DEBUG in htc-egpio and comment out the actual egpio_readw/writew call in egpio_get/set to see if register access is correct. |
| 19:01.14 | BabelO | pH5: ok i ll try later |
| 19:01.44 | BabelO | pH5: gpio_mouse look nice, for my artemis but :( have some issue understandgin union { .. } |
| 19:03.31 | miknix | BabelO, cool |
| 19:03.51 | miknix | BabelO, I'll take a look later on and see how to integrate the wizard using your code |
| 19:04.18 | BabelO | miknix: yes i just use your omap850 patch, not others thing |
| 19:04.52 | miknix | BabelO, ok |
| 19:05.42 | pH5 | BabelO: union allows to access the same memory region as completely different data types/structures. it's basically the same as allocating enough memory for the biggest type and then using casts to different data types. |
| 19:07.13 | pH5 | in the gpio_mouse case you have 7 ints, and you can access them either as pdata->up etc. or as pdata->pins[GPIO_MOUSE_PIN_UP] etc. |
| 19:12.26 | BabelO | pH5: ok, so i do someting wrong in declaration http://pastebin.ca/1014985 |
| 19:16.34 | *** join/#htc-linux surgex0 (i=surge@pool-71-186-234-216.bflony.fios.verizon.net) |
| 19:19.27 | cr2 | hi |
| 19:19.37 | cr2 | no times for hacking this weekend :( |
| 19:20.31 | kiozen | hi cr2 |
| 19:20.34 | BabelO | bbl |
| 19:20.38 | kiozen | I have done a bit ;) |
| 19:21.40 | cr2 | BabelO: can you use the gpio/irq numbers directly on omap850 ? i'd be surprised, but don't know better |
| 19:22.06 | cr2 | kiozen: i must finish a review of a paper today ;-) |
| 19:22.12 | BabelO | cr2: yes maybe that is the problem |
| 19:22.17 | BabelO | i ll look later |
| 19:22.28 | miknix | woot! |
| 19:22.31 | kiozen | cr2: sound like real work |
| 19:22.37 | miknix | directional keys are working |
| 19:23.02 | cr2 | kiozen: yeah. i've a lot of real work actually. not only hacking :) |
| 19:23.54 | exc1 | hi |
| 19:23.59 | kiozen | cr2: these times happen :) make me thinking about my postgresql database, brrrrr |
| 19:24.48 | exco | did anybody else try paulproteus' Magician image? |
| 19:25.07 | cr2 | kiozen: i'm using qt4.4 now |
| 19:25.15 | *** join/#htc-linux JohnnyK (n=johnnyk@nfx-nat-229.pilsfree.net) |
| 19:25.26 | kiozen | cr2: ok, GT is working? |
| 19:25.53 | cr2 | yes. the "older" one. |
| 19:26.05 | cr2 | compiling the new one now |
| 19:27.05 | dcordes | hi pH5. Can you remove the latest commit from htc-linux? |
| 19:29.26 | pH5 | why? |
| 19:30.31 | miknix | what means !! in C? |
| 19:30.52 | pH5 | miknix: not not |
| 19:31.08 | miknix | state = !!a; |
| 19:31.09 | pH5 | 0 ends up as 0 and anything >0 ends up as 1 usually. |
| 19:31.14 | miknix | oh |
| 19:31.23 | miknix | yeah.. I see it |
| 19:31.30 | pH5 | I guess it's part of the standard. |
| 19:31.41 | cr2 | pH5: how early one can use the new htc-egpio gpios ? i had _very_ big problems with hh.org version in machine_init() |
| 19:32.00 | cr2 | !! is just clever obfuscated C :) |
| 19:32.07 | paulproteus | !!! |
| 19:32.33 | kiozen | x ? x : x |
| 19:34.12 | cr2 | kiozen: wow. a full msword for the diary built-in |
| 19:34.55 | kiozen | lol, copy-n-paste from the QT demo |
| 19:35.14 | exco | hi paulproteus |
| 19:36.10 | paulproteus | Hi exco. |
| 19:36.22 | exco | did you try your image? |
| 19:36.56 | cr2 | kiozen: it works |
| 19:37.08 | pH5 | cr2: good question, the driver init is a subsys_initcall, so I think after plaform_add_devices it should be available. but didn't try that yet. |
| 19:37.23 | kiozen | cr2: the trolls can't change the API with every minor release ;) |
| 19:40.44 | dcordes | pH5: this one http://git.linuxtogo.org/?p=groups/mobile-linux/kernel.git;a=commit;h=8b7013acd1f4cc2a549574f97f34162e223010aa . It's empty what is that? |
| 19:40.54 | dcordes | marbalon commited it accidently |
| 19:41.25 | pH5 | dcordes: it's a merge |
| 19:41.46 | dcordes | pH5: which means? |
| 19:41.54 | *** join/#htc-linux zwox_ (i=zwox@par69-7-82-243-234-94.fbx.proxad.net) |
| 19:42.05 | dcordes | I don't think marbalon wanted to merge anything. He just wanted to push that touchscreen fix commit before |
| 19:43.41 | pH5 | I guess he already had the fix ts driver based on his previous commits and then pulled your last commit. |
| 19:44.59 | pH5 | I think if his local work branch is tracking the remote repo, it will merge automatically when he fetches |
| 19:45.57 | dcordes | pH5: he received the 'not fast forward' error when he wanted to push because he didn't have my commit in |
| 19:46.38 | pH5 | dcordes: yes, I see from the channel log that he tried to rebase his last commit onto yours |
| 19:46.59 | pH5 | but I think the "git fetch" already merged because his work branch is tracking the remote htc-msm |
| 19:49.04 | dcordes | pH5: so the rebase was unnecessary? |
| 19:51.10 | pH5 | you could say so. it didn't work (didn't do anything) because he already (accidentally) merged before. |
| 19:52.13 | dcordes | so since the commit das nothing, can we remove it to avoid confusion? |
| 19:52.25 | pH5 | look at the merge's parents and at the ts fix commit's parent to understand |
| 19:52.48 | pH5 | dcordes: the merge doesn't do nothing. it merges the previous two commits in the timeline |
| 19:53.35 | pH5 | or look at gitk to see what happened |
| 19:53.37 | dcordes | ok. what is the best way to handle such a situation he had for future reference? |
| 19:54.52 | pH5 | dcordes: a) nothing, this is the way git is supposed to work. b) avoid merging, then the rebase would have worked and the last two commits would properly be based on each other |
| 19:55.15 | pH5 | dcordes: you won't be able to avoid a) completely if people work/commit at the same time |
| 19:55.57 | pH5 | but of course to get a nice linear history, b) is exactly what marbalon tried to do. he just has to make sure that git doesn't automatically merge for him when he fetches new refs from linuxtogo's htc-msm |
| 19:56.18 | pH5 | (remove the merge option of branch htc-msm in .git/config for example) |
| 19:57.20 | dcordes | what's the difference between rebasing and merging? |
| 19:59.10 | pH5 | look at htc-msm in gitk. the history branches after 893e6... - both 8587d... and a2ec4... are based on it, and then the merge merges both of them again. |
| 20:00.21 | pH5 | the rebase would have replaced 8587d... (the ts fix) with a new commit based on a2ec4... and that the history would be linear. |
| 20:00.35 | pH5 | s/that/then/ |
| 20:01.14 | pH5 | the joys of distributed scms :) |
| 20:04.52 | dcordes | that's confusing gitk is new to me |
| 20:04.59 | paulproteus | dcordes, Here's the idea: |
| 20:05.08 | dcordes | I just notice the branch and don't understand the figures |
| 20:05.42 | paulproteus | Normally, git lets you merge other people's different histories into yours. |
| 20:05.49 | paulproteus | It records this, and that's what git pull does. |
| 20:05.51 | paulproteus | But you have another option: |
| 20:06.06 | paulproteus | (ignore the above "But you have another") |
| 20:06.10 | paulproteus | Have you used Subversion? |
| 20:06.21 | dcordes | yes svn co :) |
| 20:06.35 | paulproteus | dcordes, Okay, have you ever modified files in your svn checkout, and then done 'svn update'? |
| 20:06.48 | dcordes | no. |
| 20:06.52 | dcordes | only svn co |
| 20:07.00 | paulproteus | Gosh, I see. Okay then. (-: |
| 20:07.11 | dcordes | hopeless I know ^^ |
| 20:07.16 | paulproteus | (-; |
| 20:07.17 | pH5 | bummer, that promised to be a nice explanation :) |
| 20:07.40 | kiozen | yes, yes, yes, I am waiting for the rest :) |
| 20:08.00 | paulproteus | kiozen, Okay, I'll give the rest. (-: |
| 20:08.08 | kiozen | :) |
| 20:08.34 | paulproteus | When you have modified some files and you do svn up, svn says "G" for merGing in the changes. |
| 20:08.58 | paulproteus | With Subversion, when you svn update, the only option for svn to do is to merge in your changes with the upstream changes, or to show you a conflict happened. |
| 20:10.10 | paulproteus | Subversion can't store your history as separate from the upstream history. |
| 20:10.40 | paulproteus | In this sense, Subversion doesn't track merges of your local work with the remote work you're tracking, because it can't even know they happened. |
| 20:12.24 | paulproteus | A merge is defined (at least in git-land) as a commit with two parent commits - that is, a version in the history timeline that comes from fusing two different branches. |
| 20:12.39 | miknix | cr2, http://pastebin.com/d2f5423c9 <-- keypad driver |
| 20:13.12 | paulproteus | Subversion doesn't even have "merging" with svn merge - what it does when you "svn merge" is find the patches that one branch of the repository made, and apply them to a different branch. |
| 20:13.20 | paulproteus | But it doesn't actually *store* which revisions it's pulling patches from. |
| 20:13.22 | paulproteus | Is this clear so far? |
| 20:13.45 | kiozen | somehow |
| 20:14.09 | paulproteus | With distributed revision control like git, it could do something else: |
| 20:14.19 | paulproteus | When upstream has updates, and you have done some of your own work, it could put the two on separate branches. |
| 20:14.39 | paulproteus | In fact, it turns out that every "git clone" natively creates a branch for you to work in that is separate from the remote branch ("upstream") you are tracking. |
| 20:14.45 | *** join/#htc-linux S^P_ (n=Masood@static-host119-30-89-218.link.net.pk) |
| 20:15.32 | paulproteus | Let's say this is the timeline: |
| 20:15.38 | paulproteus | * 1:00 you patch file.c |
| 20:15.48 | paulproteus | * 1:15 ph5 patches file2.c |
| 20:15.52 | miknix | pH5, ping |
| 20:15.53 | paulproteus | * 1:30: You merge. |
| 20:16.03 | paulproteus | At 1:30, your branch has an event that ph5's branch lacks. |
| 20:16.35 | pH5 | ~pong miknix |
| 20:16.36 | apt | miknix: PONG!!!!!!!!!!!!!!!!!! |
| 20:16.40 | miknix | lol |
| 20:16.43 | paulproteus | 's ears ring. |
| 20:16.56 | miknix | pH5, I've completed the htc-i2c-cpld driver |
| 20:17.01 | *** join/#htc-linux marbalon (n=balon@aegl126.neoplus.adsl.tpnet.pl) |
| 20:17.14 | miknix | pH5, it supports backlight, leds, directional keys and vibrator |
| 20:17.20 | dcordes | will just try and git-fetch before he starts something :p |
| 20:17.34 | miknix | pH5, you have an herald correct? |
| 20:17.40 | paulproteus | Well basically, if you "git rebase", you get to use the Subversion model for this. |
| 20:17.54 | paulproteus | git will replay your patches and give you a linear history. |
| 20:18.12 | paulproteus | I guess I've run out of energy now. |
| 20:18.21 | kiozen | lol |
| 20:18.42 | paulproteus | Maybe pH5 can continue. (-; |
| 20:18.47 | pH5 | miknix: nice work. yes, I have stefan_schmidt's herald. unfortunately it is stuck in the bootloader and I couldn't figure out how to boot from diagnostic sd card yet. |
| 20:19.11 | miknix | pH5, : \ is it cid locked? |
| 20:19.16 | pH5 | of course |
| 20:19.17 | kiozen | paulproteus: to summarize it: git is doing all the merging an syncing on the server, whereas svn does it locally |
| 20:19.45 | paulproteus | kiozen, The thing is, every git repository contains enough information to be a server. |
| 20:19.56 | paulproteus | So it's more like, git does the merging in the history, whereas svn does it without storing the history. |
| 20:19.57 | miknix | pH5, sorry.. I dont know how to get the device keys to allow running the diagnostic card |
| 20:20.15 | miknix | pH5, but mine is cid locked too |
| 20:20.22 | kiozen | paulproteus: thus svn can't see differences until they are commited 1) to the server and 2) commited to the same branch |
| 20:20.32 | paulproteus | kiozen, Right, exactly. |
| 20:20.37 | pH5 | miknix: stupid thing is, I have the device keys. they are same as artemis. |
| 20:20.49 | pH5 | I'm not sure what went wrong, it just wouldn't recognize the card. |
| 20:21.06 | pH5 | but it's been some time since I tried it last. |
| 20:21.15 | miknix | pH5, hum.. it doesnt say "operation not allowed" or something? |
| 20:21.19 | kiozen | however git can do the magic and sync the trunk with all branches and return the merge to a ll branches, right? |
| 20:21.43 | pH5 | nothing, just boots right into the rgb screen after searching for sd card as if none was inserted. |
| 20:21.54 | miknix | hum.. |
| 20:21.58 | paulproteus | kiozen, Right - but then you have this thing called a merge commit. |
| 20:22.02 | paulproteus | That's the way git does merging. |
| 20:22.05 | marbalon | pH5: it is possible to remove my last merge from htc-msm ? |
| 20:22.24 | miknix | pH5, then your diagnostic signature should be wrong |
| 20:22.25 | paulproteus | But there is this other way, called "rebase". Now read http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html . |
| 20:22.45 | paulproteus | The idea is to transplant your patches as if they happened on the latest upstream. |
| 20:23.08 | paulproteus | That way, you don't have to bother anyone with the merge commits. |
| 20:23.09 | miknix | pH5, is the header within the first two sectors of the sd card? I readed that somewhere |
| 20:23.22 | pH5 | miknix: I think so, first 512 bytes |
| 20:23.51 | pH5 | miknix: is there a nice howto somewhere? |
| 20:24.02 | kiozen | paulproteus: ah, now I start to understand why this is the kernel hacker's favourite |
| 20:24.03 | miknix | pH5, yeah.. some page about artemis I think |
| 20:24.17 | pH5 | marbalon: rewriting history of a published git repository is not very nice |
| 20:24.37 | kiozen | paulproteus: merging a branch with the trunk again is a mess in svn |
| 20:24.48 | paulproteus | Yes, quite true. |
| 20:24.49 | pH5 | this merge is not a big deal, let's just keep it |
| 20:24.57 | paulproteus | pH5++ |
| 20:25.25 | marbalon | pH5: ok, but do I broke something ? commit diff is empty so we can keep this merge |
| 20:25.43 | miknix | digs into his huge unorganized favorites list |
| 20:26.10 | paulproteus | kiozen, http://changelog.complete.org/posts/586-Rebase-Considered-Harmful.html discusses this further. |
| 20:26.13 | pH5 | marbalon: no, you didn't break anything. it's just that (at least as far as git cares) the last two commits happened at the same time |
| 20:26.41 | pH5 | so the merge is just there to put the two branches together again. |
| 20:27.18 | miknix | pH5, http://vivien.chappelier.free.fr/typhoon/doc.html |
| 20:27.20 | pH5 | marbalon: if you remove the merge option for the htc-msm branch in .git/config, it won't merge and you can do the rebase in the future, as you planned to do |
| 20:27.32 | miknix | pH5, good luck. I'm going to eat |
| 20:27.37 | pH5 | miknix: thanks |
| 20:27.59 | pH5 | that's what I tried to use last time. I guess I should just try again and pay extra attention :) |
| 20:28.22 | marbalon | pH5: I need to learn more about git usage |
| 20:28.49 | marbalon | pH5: it is really different than CVS |
| 20:29.04 | pH5 | marbalon: yes, it is :) |
| 20:31.37 | marbalon | pH5: hmm, but if I want update my local copy to don't get this message "non-fast forward", i need to use.... |
| 20:31.41 | marbalon | git pull ? |
| 20:33.04 | pH5 | if you have local commits that are not in the remote you'll get the non-fast forward warning. then you can either merge (this is also what git pull does) or you can rebase |
| 20:34.37 | pH5 | marbalon: edit your .git/config and see if you have something like this: |
| 20:34.44 | pH5 | [branch "htc-msm"] |
| 20:34.51 | pH5 | <PROTECTED> |
| 20:35.00 | pH5 | <PROTECTED> |
| 20:35.07 | marbalon | yes |
| 20:35.45 | pH5 | this means that your local htc-msm branch is tracking the remote htc-msm (i.e. when you fetch, it will try to merge origin/htc-msm into htc-msm) |
| 20:36.21 | pH5 | remove those lines if you want to "git fetch; git rebase origin/htc-msm", it will stop to merge automatically then. |
| 20:36.59 | marbalon | both lines ? |
| 20:37.09 | pH5 | all three of them |
| 20:37.13 | marbalon | or all three ? |
| 20:37.14 | marbalon | ok |
| 20:37.26 | paulproteus | See also http://changelog.complete.org/posts/698-If-Version-Control-Systems-were-Airlines.html ... |
| 20:38.56 | pH5 | hehe, there you have it. changing history is rumored to lead to seizures. |
| 20:59.06 | *** join/#htc-linux LunohoD_ (n=alex@e180074230.adsl.alicedsl.de) |
| 21:04.27 | *** join/#htc-linux Marex (n=marex@vasut.kolej.mff.cuni.cz) |
| 21:07.18 | *** join/#htc-linux S^P_ (n=Masood@static-host119-30-91-13.link.net.pk) |
| 21:10.46 | *** join/#htc-linux surgex0 (i=surge@pool-71-186-234-216.bflony.fios.verizon.net) |
| 21:12.12 | *** join/#htc-linux ASUS-tek (i=microsta@221.128.205.91) |
| 21:13.49 | *** join/#htc-linux shoragan (n=shoragan@debian/developer/shoragan) |
| 21:16.56 | dcordes | lol it's asus |
| 21:18.36 | dcordes | hi ASUS-tek |
| 21:20.14 | *** join/#htc-linux S^P__ (n=Masood@static-host119-30-91-74.link.net.pk) |
| 21:24.56 | ASUS-tek | cheers |
| 21:25.11 | ASUS-tek | hi every one |
| 21:27.39 | *** join/#htc-linux surgex0 (i=surge@pool-71-186-234-216.bflony.fios.verizon.net) |
| 21:27.45 | dcordes | ASUS-tek: you got a free eee for me? |
| 21:28.38 | ASUS-tek | hahah |
| 21:28.54 | ASUS-tek | am also waiting for mine |
| 21:29.04 | dcordes | for your free one? |
| 21:29.17 | ASUS-tek | i will be working for ASUS and AMD from today |
| 21:29.37 | ASUS-tek | iguess but no final planes as so |
| 21:29.42 | dcordes | ooh asus employes are the worst fellows |
| 21:30.04 | ASUS-tek | i will be wtih ASUS channel partners |
| 21:30.08 | dcordes | :P when can you buy the ones with big display? |
| 21:30.26 | dcordes | my brother is also working for asus |
| 21:30.27 | ASUS-tek | i am in India we still haivng only 7 inch one here |
| 21:30.37 | ASUS-tek | they have been launched it france |
| 21:30.52 | dcordes | do you know when you can get them in germany? |
| 21:30.57 | ASUS-tek | then europe tiwan asia then the STATES |
| 21:31.18 | ASUS-tek | i guesss they are avaible for pre order |
| 21:31.56 | ASUS-tek | in the States but they will be avaible only when they are gona be manufacutre on large scale |
| 21:32.09 | ASUS-tek | u can also try MSI wind its also kool |
| 21:32.39 | ASUS-tek | here is the linik for it --> http://www.engadget.com/2008/03/09/msi-intros-the-eee-ish-wind-pc/ |
| 21:33.18 | dcordes | no my brother will be making a good price |
| 21:33.22 | ASUS-tek | i guess germany is far more advance then India me in 3rd world country |
| 21:33.51 | ASUS-tek | ?? i didnt get ya ur bro reseller of ASUS probucts |
| 21:34.17 | dcordes | no employe but I hope he can get me one for co worker price |
| 21:35.07 | ASUS-tek | ok what is an co worker price in Deutschland |
| 21:35.15 | dcordes | no idea at all |
| 21:35.16 | ASUS-tek | for asus eee pc |
| 21:35.36 | ASUS-tek | ok what are the prices for 4 gb current modles |
| 21:36.13 | ASUS-tek | hugs dcordes nice to know some one from Deutschland |
| 21:36.56 | dcordes | like 300? |
| 21:37.11 | ASUS-tek | 300 euros |
| 21:37.28 | ASUS-tek | or DM |
| 21:37.32 | dcordes | euros |
| 21:37.38 | dcordes | dm is deprecated long time |
| 21:37.43 | ASUS-tek | okey its guit expensive there |
| 21:38.00 | ASUS-tek | i dont know about that |
| 21:38.19 | dcordes | you can't use DM any longer |
| 21:38.22 | ASUS-tek | here it cost in $ about 300 $ |
| 21:38.27 | ASUS-tek | about 1200 Rs |
| 21:38.28 | dcordes | that's cheap |
| 21:38.32 | ASUS-tek | In india |
| 21:38.36 | dcordes | does asus manufacture in india? |
| 21:38.50 | ASUS-tek | nope man they manufacture in China |
| 21:39.07 | ASUS-tek | they used to in taiwan previously |
| 21:39.20 | dcordes | it's more cheapo in china I guess |
| 21:39.32 | ASUS-tek | i am wondering when they goan start there vetnain plant |
| 21:40.44 | ASUS-tek | naa china or made in china is epencive for chinaese but as the yare manufacutred in special ecomonic zone in china they are nore cheap as they are for exports |
| 21:41.38 | ASUS-tek | eee pc might be very cheap in Hong kong or taiwan it self |
| 21:42.14 | ASUS-tek | dcordes what do u do by the way |
| 21:45.19 | dcordes | school |
| 21:45.31 | ASUS-tek | kool man |
| 21:45.36 | dcordes | but only until wednesday |
| 21:45.38 | ASUS-tek | tell me more about ur |
| 21:45.50 | ASUS-tek | ok u student or teacher |
| 21:46.02 | dcordes | student |
| 21:46.13 | ASUS-tek | okey kool |
| 21:46.19 | ASUS-tek | u also using htc |
| 21:46.20 | dcordes | do you own a htc device btw? |
| 21:46.24 | dcordes | :P |
| 21:46.53 | ASUS-tek | nope i jsut went in to this channel as it was related to linux |
| 21:47.17 | ASUS-tek | i jsut wanted to experence what is happening on linux front in hadheld devices |
| 21:48.12 | ASUS-tek | u on linux dcordes |
| 21:50.23 | dcordes | yea |
| 21:50.33 | dcordes | there is a lot happening |
| 21:51.12 | ASUS-tek | okey kool same here |
| 21:51.27 | ASUS-tek | lots of my frienda are ardering ubuntu shipit cd |
| 21:51.37 | ASUS-tek | ordering * |
| 21:51.51 | ASUS-tek | which distro u using dcordes |
| 21:52.27 | dcordes | ubuntu with its gigantic pr is what got me away from the dark side |
| 21:52.29 | dcordes | ubuntu |
| 21:53.00 | ASUS-tek | okey what is gigantic pr ?? |
| 21:53.14 | dcordes | advertising |
| 21:53.27 | ASUS-tek | am new to that term well ur friends to using ubuntu |
| 21:53.29 | dcordes | there is much money behind ubuntu |
| 21:53.41 | ASUS-tek | how come can u explain |
| 21:53.50 | ASUS-tek | like me to also new to linux |
| 21:54.14 | ASUS-tek | advertising |
| 21:54.21 | ASUS-tek | of ubuntu kool |
| 21:55.06 | dcordes | think about how much shipit costs |
| 21:55.13 | ASUS-tek | okey and |
| 21:55.27 | ASUS-tek | okey humm.. i got it waht u syaing |
| 21:55.50 | ASUS-tek | ya man we get our ubuntu ship it from germany it self |
| 21:56.12 | ASUS-tek | Deutschland post the biggest of all in the europe |
| 21:56.41 | ASUS-tek | well how many friends u influenced to use ubuntu |
| 21:57.25 | *** join/#htc-linux |patoche| (n=patoche@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 22:01.53 | *** join/#htc-linux patoche (n=patoche@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 22:02.47 | *** join/#htc-linux patoche (n=Patrice@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 22:02.48 | ASUS-tek | where is dcordes kido he suddenly disapeared |
| 22:04.40 | *** part/#htc-linux ASUS-tek (i=microsta@221.128.205.91) |
| 22:06.24 | *** join/#htc-linux patoche (n=pat@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 22:14.19 | *** join/#htc-linux surgex0 (i=surge@pool-71-186-234-216.bflony.fios.verizon.net) |
| 22:39.21 | *** join/#htc-linux patoche (n=Patrice@lns-bzn-24-82-64-163-99.adsl.proxad.net) |
| 23:23.32 | *** join/#htc-linux skodde (n=skodde@unaffiliated/skodde) |
| 23:45.03 | revertive | BabelO: ping |
| 23:56.37 | *** join/#htc-linux Marex (n=marex@vasut.kolej.mff.cuni.cz) |